From cf4b5ddc93a6d2098e59c8c448d600c7fe676e33 Mon Sep 17 00:00:00 2001 From: Igor Gassmann Date: Mon, 29 Jan 2018 09:04:41 -0300 Subject: [PATCH] Comment out initial daemon killin --- src/main/Daemon.js | 26 +++---- src/main/index.js | 31 +++++--- yarn.lock | 176 ++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 199 insertions(+), 34 deletions(-) diff --git a/src/main/Daemon.js b/src/main/Daemon.js index b97d4714f..7ed6cde8f 100644 --- a/src/main/Daemon.js +++ b/src/main/Daemon.js @@ -13,19 +13,19 @@ export default class Daemon { launch() { // Kill any running daemon - if (process.platform === 'win32') { - try { - execSync('taskkill /im lbrynet-daemon.exe /t /f'); - } catch (error) { - console.warn(error.message); - } - } else { - try { - execSync('pkill lbrynet-daemon'); - } catch (error) { - console.warn(error.message); - } - } + // if (process.platform === 'win32') { + // try { + // execSync('taskkill /im lbrynet-daemon.exe /t /f'); + // } catch (error) { + // console.warn(error.message); + // } + // } else { + // try { + // execSync('pkill lbrynet-daemon'); + // } catch (error) { + // console.warn(error.message); + // } + // } console.log('Launching daemon:', Daemon.path); this.subprocess = spawn(Daemon.path); diff --git a/src/main/index.js b/src/main/index.js index 6894ee5a1..965c0480e 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -83,21 +83,30 @@ app.on('activate', () => { if (!rendererWindow) rendererWindow = createWindow(); }); -app.on('will-quit', (event) => { - if (process.platform === 'win32' && autoUpdateDownloaded && !autoUpdateAccepted && !showingAutoUpdateCloseAlert) { +app.on('will-quit', event => { + if ( + process.platform === 'win32' && + autoUpdateDownloaded && + !autoUpdateAccepted && + !showingAutoUpdateCloseAlert + ) { // We're on Win and have an update downloaded, but the user declined it (or closed // the app without accepting it). Now the user is closing the app, so the new update // will install. On Mac this is silent, but on Windows they get a confusing permission // escalation dialog, so we show Windows users a warning dialog first. showingAutoUpdateCloseAlert = true; - dialog.showMessageBox({ - type: 'info', - title: 'LBRY Will Upgrade', - message: 'LBRY has a pending upgrade. Please select "Yes" to install it on the prompt shown after this one.', - }, () => { - app.quit(); - }); + dialog.showMessageBox( + { + type: 'info', + title: 'LBRY Will Upgrade', + message: + 'LBRY has a pending upgrade. Please select "Yes" to install it on the prompt shown after this one.', + }, + () => { + app.quit(); + } + ); event.preventDefault(); return; @@ -144,7 +153,7 @@ ipcMain.on('upgrade', (event, installerPath) => { autoUpdater.on('update-downloaded', () => { autoUpdateDownloaded = true; -}) +}); ipcMain.on('autoUpdateAccepted', () => { autoUpdateAccepted = true; @@ -238,4 +247,4 @@ const isSecondInstance = app.makeSingleInstance(argv => { if (isSecondInstance) { app.exit(); -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index fdaa8c2b5..00e6bb633 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6,11 +6,15 @@ version "1.1.0" resolved "https://registry.yarnpkg.com/7zip-bin-linux/-/7zip-bin-linux-1.1.0.tgz#2ca309fd6a2102e18bd81e3a5d91b39db9adab71" -"7zip-bin-mac@^1.0.1": +"7zip-bin-linux@~1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/7zip-bin-linux/-/7zip-bin-linux-1.3.1.tgz#4856db1ab1bf5b6ee8444f93f5a8ad71446d00d5" + +"7zip-bin-mac@^1.0.1", "7zip-bin-mac@~1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/7zip-bin-mac/-/7zip-bin-mac-1.0.1.tgz#3e68778bbf0926adc68159427074505d47555c02" -"7zip-bin-win@^2.1.1": +"7zip-bin-win@^2.1.1", "7zip-bin-win@~2.1.1": version "2.1.1" resolved "https://registry.yarnpkg.com/7zip-bin-win/-/7zip-bin-win-2.1.1.tgz#8acfc28bb34e53a9476b46ae85a97418e6035c20" @@ -30,6 +34,14 @@ "7zip-bin-mac" "^1.0.1" "7zip-bin-win" "^2.1.1" +"7zip-bin@^2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-2.4.1.tgz#88cf99736d35b104dab1d430c4edd1d51e58aade" + optionalDependencies: + "7zip-bin-linux" "~1.3.1" + "7zip-bin-mac" "~1.0.1" + "7zip-bin-win" "~2.1.1" + "7zip@0.0.6": version "0.0.6" resolved "https://registry.yarnpkg.com/7zip/-/7zip-0.0.6.tgz#9cafb171af82329490353b4816f03347aa150a30" @@ -469,6 +481,20 @@ autoprefixer@^6.3.1: postcss "^5.2.16" postcss-value-parser "^3.2.3" +aws-sdk@^2.186.0: + version "2.188.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.188.0.tgz#9062abc7dba6393459fa2f3423cf5d294f004611" + dependencies: + buffer "4.9.1" + events "^1.1.1" + jmespath "0.15.0" + querystring "0.2.0" + sax "1.2.1" + url "0.10.3" + uuid "3.1.0" + xml2js "0.4.17" + xmlbuilder "4.2.1" + aws-sign2@~0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f" @@ -1576,7 +1602,7 @@ buffer-xor@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" -buffer@^4.3.0: +buffer@4.9.1, buffer@^4.3.0: version "4.9.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298" dependencies: @@ -1615,6 +1641,15 @@ builder-util-runtime@^3.3.1, builder-util-runtime@^3.4.0: fs-extra-p "^4.5.0" sax "^1.2.4" +builder-util-runtime@^4.0.3, builder-util-runtime@~4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.0.3.tgz#c9f1959598e3fb534cdbe9ce4160e985af11a0fe" + dependencies: + bluebird-lst "^1.0.5" + debug "^3.1.0" + fs-extra-p "^4.5.0" + sax "^1.2.4" + builder-util@3.4.4, builder-util@^3.4.4: version "3.4.4" resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-3.4.4.tgz#cab30f37c1ee4fb23d33b20ac71e76e3c8451d28" @@ -1657,6 +1692,26 @@ builder-util@^3.4.2: temp-file "^3.0.0" tunnel-agent "^0.6.0" +builder-util@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-4.2.1.tgz#ca9f0ddb5af1da5fe432129f7c6cbd447b552016" + dependencies: + "7zip-bin" "^2.4.1" + bluebird-lst "^1.0.5" + builder-util-runtime "^4.0.3" + chalk "^2.3.0" + debug "^3.1.0" + fs-extra-p "^4.5.0" + ini "^1.3.5" + is-ci "^1.1.0" + js-yaml "^3.10.0" + lazy-val "^1.0.3" + semver "^5.5.0" + source-map-support "^0.5.1" + stat-mode "^0.2.2" + temp-file "^3.1.1" + tunnel-agent "^0.6.0" + builtin-modules@^1.0.0, builtin-modules@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" @@ -2847,6 +2902,14 @@ electron-download@^3.0.1: semver "^5.3.0" sumchecker "^1.2.0" +electron-is-dev@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.3.0.tgz#14e6fda5c68e9e4ecbeff9ccf037cbd7c05c5afe" + +electron-log@^2.2.12: + version "2.2.14" + resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-2.2.14.tgz#2123319ccb8d70b0db07f0eda57d5823cb42b4b0" + electron-osx-sign@0.4.7: version "0.4.7" resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.4.7.tgz#1d75647a82748eacd48bea70616ec83ffade3ee5" @@ -2869,10 +2932,46 @@ electron-publish@19.49.0: fs-extra-p "^4.5.0" mime "^2.0.3" +electron-publish@~19.55.2: + version "19.55.2" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-19.55.2.tgz#773b6d13bc11312095848c08b3287f98c91ccc7e" + dependencies: + bluebird-lst "^1.0.5" + builder-util "^4.2.1" + builder-util-runtime "^4.0.3" + chalk "^2.3.0" + fs-extra-p "^4.5.0" + mime "^2.2.0" + +electron-publisher-s3@^19.47.0: + version "19.55.2" + resolved "https://registry.yarnpkg.com/electron-publisher-s3/-/electron-publisher-s3-19.55.2.tgz#59446ebcf465e01995f67820592f13142d4146d8" + dependencies: + aws-sdk "^2.186.0" + bluebird-lst "^1.0.5" + builder-util "^4.2.1" + electron-publish "~19.55.2" + fs-extra-p "^4.5.0" + mime "^2.2.0" + electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.27: version "1.3.27" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d" +electron-updater@^2.16.1: + version "2.20.1" + resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.20.1.tgz#3d2714a3e472fbf198f6053daf8fd12209101aa2" + dependencies: + bluebird-lst "^1.0.5" + builder-util-runtime "~4.0.3" + electron-is-dev "^0.3.0" + fs-extra-p "^4.5.0" + js-yaml "^3.10.0" + lazy-val "^1.0.3" + lodash.isequal "^4.5.0" + semver "^5.5.0" + source-map-support "^0.5.2" + electron-webpack-js@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/electron-webpack-js/-/electron-webpack-js-1.1.0.tgz#c7c1cf375f6d32638ba62f46e1bd31445b7f1018" @@ -3358,7 +3457,7 @@ eventemitter3@1.x.x: version "1.2.0" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508" -events@^1.0.0: +events@^1.0.0, events@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" @@ -4659,6 +4758,12 @@ is-ci@^1.0.10: dependencies: ci-info "^1.0.0" +is-ci@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5" + dependencies: + ci-info "^1.0.0" + is-cidr@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-cidr/-/is-cidr-1.0.0.tgz#fb5aacf659255310359da32cae03e40c6a1c2afc" @@ -4957,6 +5062,10 @@ jest-validate@^21.1.0: leven "^2.1.0" pretty-format "^21.2.1" +jmespath@0.15.0: + version "0.15.0" + resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217" + js-base64@^2.1.8, js-base64@^2.1.9: version "2.3.2" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.3.2.tgz#a79a923666372b580f8e27f51845c6f7e8fbfbaf" @@ -5396,7 +5505,7 @@ lodash.isempty@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e" -lodash.isequal@4.5.0: +lodash.isequal@4.5.0, lodash.isequal@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" @@ -5694,6 +5803,10 @@ mime@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/mime/-/mime-2.0.3.tgz#4353337854747c48ea498330dc034f9f4bbbcc0b" +mime@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.2.0.tgz#161e541965551d3b549fa1114391e3a3d55b923b" + mimic-fn@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18" @@ -7952,7 +8065,11 @@ sass-loader@^6.0.6: lodash.tail "^4.1.1" pify "^3.0.0" -sax@^1.2.4, sax@~1.2.1: +sax@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a" + +sax@>=0.6.0, sax@^1.2.4, sax@~1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -7993,6 +8110,10 @@ semver@^5.3.0, semver@~5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" +semver@^5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" + send@0.16.1: version "0.16.1" resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3" @@ -8233,6 +8354,12 @@ source-map-support@^0.5.0: dependencies: source-map "^0.6.0" +source-map-support@^0.5.1, source-map-support@^0.5.2: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76" + dependencies: + source-map "^0.6.0" + source-map@0.1.31: version "0.1.31" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.31.tgz#9f704d0d69d9e138a81badf6ebb4fde33d151c61" @@ -8617,6 +8744,15 @@ temp-file@^3.0.0: fs-extra-p "^4.4.4" lazy-val "^1.0.2" +temp-file@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.1.1.tgz#8823649aa4e8a6e419eb71b601a2e4d472b0f24f" + dependencies: + async-exit-hook "^2.0.1" + bluebird-lst "^1.0.5" + fs-extra-p "^4.5.0" + lazy-val "^1.0.3" + term-size@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69" @@ -8968,6 +9104,13 @@ url-to-options@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" +url@0.10.3: + version "0.10.3" + resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64" + dependencies: + punycode "1.3.2" + querystring "0.2.0" + url@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" @@ -9005,14 +9148,14 @@ utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" +uuid@3.1.0, uuid@^3.0.0, uuid@^3.1.0, uuid@~3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + uuid@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a" -uuid@^3.0.0, uuid@^3.1.0, uuid@~3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" - validate-npm-package-license@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc" @@ -9295,6 +9438,19 @@ xml-char-classes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d" +xml2js@0.4.17: + version "0.4.17" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.17.tgz#17be93eaae3f3b779359c795b419705a8817e868" + dependencies: + sax ">=0.6.0" + xmlbuilder "^4.1.0" + +xmlbuilder@4.2.1, xmlbuilder@^4.1.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-4.2.1.tgz#aa58a3041a066f90eaa16c2f5389ff19f3f461a5" + dependencies: + lodash "^4.0.0" + xmlbuilder@8.2.2: version "8.2.2" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-8.2.2.tgz#69248673410b4ba42e1a6136551d2922335aa773"