diff options
| author | Erik Larkö <erik@mullvad.net> | 2017-07-21 08:32:18 +0200 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2017-07-21 08:32:18 +0200 |
| commit | be75990c6ebdd7f0ee356775ecd017b6e3bc0fc0 (patch) | |
| tree | 403af44df1cb446d7cccc3030dd61e98e28442a8 | |
| parent | fdd944e37a8a1d62796fd468b12f6a8224a2131c (diff) | |
| parent | 171ed231cf02ae91500fdc1f864987f588c56592 (diff) | |
| download | mullvadvpn-be75990c6ebdd7f0ee356775ecd017b6e3bc0fc0.tar.xz mullvadvpn-be75990c6ebdd7f0ee356775ecd017b6e3bc0fc0.zip | |
Merge branch 'upgraded-electron-sudo'
| -rw-r--r-- | app/main.js | 2 | ||||
| -rw-r--r-- | yarn.lock | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/app/main.js b/app/main.js index c3e6d1cca9..ae7553ce45 100644 --- a/app/main.js +++ b/app/main.js @@ -91,7 +91,7 @@ const appDelegate = { name: 'Mullvad', }; const sudo = new ElectronSudo(options); - sudo.spawn( pathToBackend, ['-vv --log ' + path.join(appDelegate._logFileLocation, 'backend.log')] ) + sudo.spawn( pathToBackend, ['-vv --log "' + path.join(appDelegate._logFileLocation, 'backend.log"')] ) .then( p => { appDelegate._setupBackendProcessListeners(p); return p; @@ -2095,7 +2095,7 @@ electron-publish@19.12.0: "electron-sudo@https://github.com/eriklarko/electron-sudo.git": version "4.0.12" - resolved "https://github.com/eriklarko/electron-sudo.git#d351ea8c9ce13f7e69955168d00acfdf66c1ead2" + resolved "https://github.com/eriklarko/electron-sudo.git#f71134f86541b15359f4813715d721818fb2b1f4" dependencies: babel-runtime "^6.18.0" bluebird "^3.4.6" @@ -4091,11 +4091,7 @@ number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" -"nwmatcher@>= 1.3.7 < 2.0.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.0.tgz#b4389362170e7ef9798c3c7716d80ebc0106fccf" - -nwmatcher@^1.4.1: +"nwmatcher@>= 1.3.7 < 2.0.0", nwmatcher@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.1.tgz#7ae9b07b0ea804db7e25f05cb5fe4097d4e4949f" |