Permalink
Browse files

bump electron 1.2.6, fixes linux icon

  • Loading branch information...
1 parent 5a8dabd commit fca28938abc69be049dda96d4492b73f8f51081c @Autre31415 Autre31415 committed Jul 7, 2016
Showing with 8 additions and 8 deletions.
  1. BIN images/icon.png
  2. +1 −1 main.js
  3. +7 −7 package.json
View
Deleted file not rendered
View
@@ -11,7 +11,7 @@ function createWindow () {
height: 700,
minWidth: 1000,
minHeight: 700,
- icon: process.platform === 'linux' && __dirname + '/images/icon.png'
+ icon: process.platform === 'linux' && __dirname + '/images/appicon.png'
});
win.loadURL('file://' + __dirname + '/bower_components/glyphr-studio/dev/Glyphr_Studio_Autohacked_For_Electron.html');
View
@@ -7,18 +7,18 @@
"open": "0.0.5"
},
"devDependencies": {
- "electron-prebuilt": "1.2.5",
- "electron-packager": "7.1.0",
+ "electron-prebuilt": "1.2.6",
+ "electron-packager": "7.2.0",
"bower": "1.7.9"
},
"scripts": {
"start": "node build.js && electron .",
"build": "npm run build-64 && npm run build-win32 && npm run build-linux32",
"build-64": "node build.js && npm run build-mac && npm run build-win && npm run build-linux",
- "build-mac": "node build.js && electron-packager ./ 'Glyphr Studio' --app-bundle-id=glyphr-studio-desktop --icon=images/appicon.icns --asar --prune --out=build --overwrite=true --platform=darwin --arch=x64 --version=1.2.5 --app-version=0.1.3",
- "build-win": "node build.js && electron-packager ./ 'Glyphr Studio' --app-bundle-id=glyphr-studio-desktop --version-string.FileDescription='Glyphr Studio Desktop' --icon=images/appicon.ico --asar --prune --out=build --overwrite=true --platform=win32 --arch=x64 --version=1.2.5 --app-version=0.1.3",
- "build-win32": "node build.js && electron-packager ./ 'Glyphr Studio' --app-bundle-id=glyphr-studio-desktop --version-string.FileDescription='Glyphr Studio Desktop' --icon=images/appicon.ico --asar --prune --out=build --overwrite=true --platform=win32 --arch=ia32 --version=1.2.5 --app-version=0.1.3",
- "build-linux": "node build.js && electron-packager ./ 'Glyphr Studio' --app-bundle-id=glyphr-studio-desktop --asar --prune --out=build --overwrite=true --platform=linux --arch=x64 --version=1.2.5 --app-version=0.1.3",
- "build-linux32": "node build.js && electron-packager ./ 'Glyphr Studio' --app-bundle-id=glyphr-studio-desktop --asar --prune --out=build --overwrite=true --platform=linux --arch=ia32 --version=1.2.5 --app-version=0.1.3"
+ "build-mac": "node build.js && electron-packager ./ 'Glyphr Studio' --app-bundle-id=glyphr-studio-desktop --icon=images/appicon.icns --asar --prune --out=build --overwrite=true --platform=darwin --arch=x64 --version=1.2.6 --app-version=0.1.3",
+ "build-win": "node build.js && electron-packager ./ 'Glyphr Studio' --app-bundle-id=glyphr-studio-desktop --version-string.FileDescription='Glyphr Studio Desktop' --icon=images/appicon.ico --asar --prune --out=build --overwrite=true --platform=win32 --arch=x64 --version=1.2.6 --app-version=0.1.3",
+ "build-win32": "node build.js && electron-packager ./ 'Glyphr Studio' --app-bundle-id=glyphr-studio-desktop --version-string.FileDescription='Glyphr Studio Desktop' --icon=images/appicon.ico --asar --prune --out=build --overwrite=true --platform=win32 --arch=ia32 --version=1.2.6 --app-version=0.1.3",
+ "build-linux": "node build.js && electron-packager ./ 'Glyphr Studio' --app-bundle-id=glyphr-studio-desktop --asar --prune --out=build --overwrite=true --platform=linux --arch=x64 --version=1.2.6 --app-version=0.1.3",
+ "build-linux32": "node build.js && electron-packager ./ 'Glyphr Studio' --app-bundle-id=glyphr-studio-desktop --asar --prune --out=build --overwrite=true --platform=linux --arch=ia32 --version=1.2.6 --app-version=0.1.3"
}
}

0 comments on commit fca2893

Please sign in to comment.