diff --git a/lib/index.js b/lib/index.js index 19384ba..0ab60ba 100644 --- a/lib/index.js +++ b/lib/index.js @@ -18,6 +18,27 @@ export default function interactive () { } } + function getPackageVersion () { + try { + const pkg = require(path.join(process.cwd(), 'package.json')) + return pkg.version + } catch (e) { + return '0.0.1' + } + } + + function getElectronVersion () { + try { + const pkg = require(path.join(process.cwd(), 'package.json')) + let fin + if(pkg.dependencies && pkg.dependencies.electron) fin = pkg.dependencies.electron + if(pkg.devDependencies && pkg.devDependencies.electron) fin = pkg.devDependencies.electron + return fin + } catch (e) { + return '7.1.5' + } + } + function runElectronPackager (settings) { log.log('Electron packager settings:') log.log(settings) @@ -35,7 +56,9 @@ export default function interactive () { name: getPackageName(), platform: 'all', arch: 'all', - electronVersion: '1.6.15', + electronVersion: getElectronVersion(), + version: getPackageVersion(), + defaultIcon: path.join(process.cwd(), 'assets', 'icon.ico'), out: path.join(process.cwd(), 'releases'), 'appBundleId': '', 'appVersion': '', @@ -91,12 +114,13 @@ export default function interactive () { type: 'input', name: 'appVersion', message: 'Select App Version(optional):', - default: '0.0.1' + default: settings.version }, { type: 'input', name: 'icon', - message: 'Select Electron icon file:' + message: 'Select Electron icon file:', + default: settings.defaultIcon }, { type: 'input',