fix linux builds
This commit is contained in:
parent
4dc434cfa5
commit
70ee74cff4
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -18,8 +18,6 @@ function spawnNpmInstallProcess (targetDir) {
|
|||
})
|
||||
}
|
||||
|
||||
spawnNpmInstallProcess(__dirname)
|
||||
|
||||
fs.readdirSync(MODULES_DIRNAME, {withFileTypes: true})
|
||||
.forEach(e => {
|
||||
if(!e.isDirectory())return
|
||||
|
|
|
@ -373,13 +373,20 @@ function launchMainAppWindow(isVisible) {
|
|||
|
||||
if(!settings.get("NO_WINDOWS_BOUND", false))applyWindowBoundsToConfig(mainWindowOptions);
|
||||
|
||||
mainWindow = new electron.BrowserWindow(mainWindowOptions);
|
||||
mainWindow = new glasstron.BrowserWindow(mainWindowOptions);
|
||||
mainWindowId = mainWindow.id;
|
||||
global.mainWindowId = mainWindowId;
|
||||
if(settings.get("GLASSTRON", true)){
|
||||
let blurType = mainWindow.blurType
|
||||
mainWindow.blurType = settings.get("GLASSTRON_BLUR", "blurbehind")
|
||||
mainWindow.setVibrancy("fullscreen-ui")
|
||||
mainWindow.setBlur(true)
|
||||
try {
|
||||
mainWindow.setBlur(true)
|
||||
} catch (e){
|
||||
console.error(e)
|
||||
console.error("Could not setBlur(), transparency effects will not work.")
|
||||
mainWindow.blurType = blurType
|
||||
}
|
||||
}
|
||||
|
||||
mainWindow.webContents.session.webRequest.onHeadersReceived(function(details, callback) {
|
||||
|
|
|
@ -881,14 +881,6 @@
|
|||
"@electron/get": "^1.0.1",
|
||||
"@types/node": "^12.0.12",
|
||||
"extract-zip": "^1.0.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@types/node": {
|
||||
"version": "12.12.55",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.55.tgz",
|
||||
"integrity": "sha512-Vd6xQUVvPCTm7Nx1N7XHcpX6t047ltm7TgcsOr4gFHjeYgwZevo+V7I1lfzHnj5BT5frztZ42+RTG4MwYw63dw==",
|
||||
"dev": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"electron-builder": {
|
||||
|
@ -1023,16 +1015,6 @@
|
|||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
|
||||
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
|
||||
"dev": true
|
||||
},
|
||||
"yauzl": {
|
||||
"version": "2.10.0",
|
||||
"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
|
||||
"integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"buffer-crc32": "~0.2.3",
|
||||
"fd-slicer": "~1.1.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
"test": "npm run compile && electron .",
|
||||
"run": "electron .",
|
||||
"build": "npm run build:minify && npm run build:electron",
|
||||
"build:electron": "npm run build:electron_win && npm run build:electron_linux && npm run build:electron_mac",
|
||||
"build:electron": "node build_electron.js",
|
||||
"build:electron_win": "electron-builder build --config electron-builder.yaml --win",
|
||||
"build:electron_linux": "electron-builder build --config electron-builder.yaml --linux",
|
||||
"build:electron_mac": "electron-builder build --config electron-builder.yaml --mac",
|
||||
|
|
Loading…
Reference in New Issue