Skip to content

Commit

Permalink
Electron: Fixes #36: Set installation directory for Windows installer
Browse files Browse the repository at this point in the history
  • Loading branch information
laurent22 committed Dec 7, 2017
1 parent f242a3c commit 027f96d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 0 additions & 2 deletions CliClient/app/command-sync.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ class Command extends BaseCommand {
options() {
return [
['--target <target>', _('Sync to provided target (defaults to sync.target config value)')],
['--random-failures', 'For debugging purposes. Do not use.'],
];
}

Expand Down Expand Up @@ -140,7 +139,6 @@ class Command extends BaseCommand {
cliUtils.redrawDone();
this.stdout(msg);
},
randomFailures: args.options['random-failures'] === true,
};

this.stdout(_('Synchronisation target: %s (%s)', Setting.enumOptionLabel('sync.target', this.syncTargetId_), this.syncTargetId_));
Expand Down
2 changes: 1 addition & 1 deletion CliClient/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion CliClient/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
],
"owner": "Laurent Cozic"
},
"version": "0.10.78",
"version": "0.10.79",
"bin": {
"joplin": "./main.js"
},
Expand Down
4 changes: 4 additions & 0 deletions ElectronClient/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
"win": {
"icon": "../../Assets/Joplin.ico"
},
"nsis": {
"oneClick": false,
"allowToChangeInstallationDirectory": true
},
"mac": {
"icon": "../../Assets/macOs.icns",
"asar": false
Expand Down

0 comments on commit 027f96d

Please sign in to comment.