This repository has been archived by the owner on Sep 5, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* fix Mist/Wallet app bundling * update electron-packager to 7.0.2
- Loading branch information
Showing
12 changed files
with
194 additions
and
169 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,3 +4,4 @@ interface_build/ | |
| interface/public/i18n/ | ||
| dist_wallet/ | ||
| dist_mist/ | ||
| config.json | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,172 @@ | ||
| const log = require('./utils/logger').create('Settings'); | ||
| const logger = require('./utils/logger'); | ||
| const packageJson = require('../package.json'); | ||
|
|
||
|
|
||
| var _settings = {}; | ||
| // try loading in config file | ||
| let defaultConfig = { | ||
| mode: 'mist', | ||
| production: false, | ||
| }; | ||
| try { | ||
| _.extend(defaultConfig, require('../config.json')); | ||
| } catch (err) { | ||
| } | ||
|
|
||
|
|
||
| exports.get = function(key) { | ||
| var value = _settings[key]; | ||
|
|
||
| log.trace('get', key, value); | ||
| const argv = require('yargs') | ||
| .usage('Usage: $0 [Mist options] -- [Node options]') | ||
| .option({ | ||
| mode: { | ||
| alias: 'm', | ||
| demand: false, | ||
| default: defaultConfig.mode, | ||
| describe: 'App UI mode: wallet, mist.', | ||
| requiresArg: true, | ||
| nargs: 1, | ||
| type: 'string', | ||
| group: 'Mist options:', | ||
| }, | ||
| ipcpath: { | ||
| demand: false, | ||
| describe: 'Path to node IPC socket file (this will automatically get passed as an option to Geth).', | ||
| requiresArg: true, | ||
| nargs: 1, | ||
| type: 'string', | ||
| group: 'Mist options:', | ||
| }, | ||
| gethpath: { | ||
| demand: false, | ||
| describe: 'Path to Geth executable to use instead of default.', | ||
| requiresArg: true, | ||
| nargs: 1, | ||
| type: 'string', | ||
| group: 'Mist options:', | ||
| }, | ||
| ethpath: { | ||
| demand: false, | ||
| describe: 'Path to Eth executable to use instead of default.', | ||
| requiresArg: true, | ||
| nargs: 1, | ||
| type: 'string', | ||
| group: 'Mist options:', | ||
| }, | ||
| 'ignore-gpu-blacklist': { | ||
| demand: false, | ||
| describe: 'Ignores GPU blacklist (needed for some Linux installations).', | ||
| requiresArg: false, | ||
| nargs: 0, | ||
| type: 'boolean', | ||
| group: 'Mist options:', | ||
| }, | ||
| 'reset-tabs': { | ||
| demand: false, | ||
| describe: 'Reset Mist tabs to their default settings.', | ||
| requiresArg: false, | ||
| nargs: 0, | ||
| type: 'boolean', | ||
| group: 'Mist options:', | ||
| }, | ||
| logfile: { | ||
| demand: false, | ||
| describe: 'Logs will be written to this file in addition to the console.', | ||
| requiresArg: true, | ||
| nargs: 1, | ||
| type: 'string', | ||
| group: 'Mist options:', | ||
| }, | ||
| loglevel: { | ||
| demand: false, | ||
| default: 'info', | ||
| describe: 'Minimum logging threshold: trace (all logs), debug, info, warn, error.', | ||
| requiresArg: true, | ||
| nargs: 1, | ||
| type: 'string', | ||
| group: 'Mist options:', | ||
| }, | ||
| version: { | ||
| alias: 'v', | ||
| demand: false, | ||
| requiresArg: false, | ||
| nargs: 0, | ||
| describe: 'Display Mist version.', | ||
| group: 'Mist options:', | ||
| type: 'boolean', | ||
| }, | ||
| '': { | ||
| describe: 'All options will be passed onto the node (e.g. Geth).', | ||
| group: 'Node options:', | ||
| } | ||
| }) | ||
| .help('h') | ||
| .alias('h', 'help') | ||
| .parse(process.argv.slice(1)); | ||
|
|
||
| return value; | ||
| }; | ||
|
|
||
| argv.nodeOptions = []; | ||
|
|
||
| exports.set = function(key, value) { | ||
| log.trace('set', key, value); | ||
| for (let optIdx in argv._) { | ||
| if ('-' === argv._[optIdx].charAt(0)) { | ||
| argv.nodeOptions = argv._.slice(optIdx); | ||
|
|
||
| _settings[key] = value; | ||
| }; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| // some options are shared | ||
| if (argv.ipcpath) { | ||
| argv.nodeOptions.push('--ipcpcath', argv.ipcpath); | ||
| } | ||
|
|
||
|
|
||
|
|
||
| var log = null; | ||
|
|
||
|
|
||
| class Settings { | ||
| init () { | ||
| logger.setup(argv); | ||
|
|
||
| this._log = logger.create('Settings'); | ||
| } | ||
|
|
||
| get cli () { | ||
| return argv; | ||
| } | ||
|
|
||
| get appVersion () { | ||
| return packageJson.version; | ||
| } | ||
|
|
||
| get appLicense () { | ||
| return packageJson.license; | ||
| } | ||
|
|
||
| get uiMode () { | ||
| return argv.mode; | ||
| } | ||
|
|
||
| get inProductionMode () { | ||
| return defaultConfig.production; | ||
| } | ||
|
|
||
| get gethPath () { | ||
| return argv.gethpath; | ||
| } | ||
|
|
||
| get ethPath () { | ||
| return argv.ethpath; | ||
| } | ||
|
|
||
| get ipcPath () { | ||
| return argv.ipcpath; | ||
| } | ||
|
|
||
| get nodeOptions () { | ||
| return argv.nodeOptions; | ||
| } | ||
|
|
||
|
|
||
| } | ||
|
|
||
| module.exports = new Settings(); |
Oops, something went wrong.