diff --git a/package.json b/package.json index b3726d3..7e72a29 100644 --- a/package.json +++ b/package.json @@ -74,6 +74,7 @@ "axios": "^0.16.1", "dateformat": "^3.0.3", "element-ui": "^2.4.11", + "fix-path": "^2.1.0", "fs-extra": "^4.0.2", "image-size": "^0.6.1", "keycode": "^2.1.9", diff --git a/src/main/index.js b/src/main/index.js index b5172dc..0e5c362 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -8,6 +8,7 @@ import updateChecker from './utils/updateChecker' import { getPicBeds } from './utils/getPicBeds' import pkg from '../../package.json' import picgoCoreIPC from './utils/picgoCoreIPC' +import fixPath from 'fix-path' /** * Set `__static` path to static files in production * https://simulatedgreg.gitbooks.io/electron-vue/content/en/using-static-assets.html @@ -35,6 +36,9 @@ const miniWinURL = process.env.NODE_ENV === 'development' ? `http://localhost:9080/#mini-page` : `file://${__dirname}/index.html#mini-page` +// fix the $PATH in macOS +fixPath() + function createContextMenu () { const picBeds = getPicBeds(app) const submenu = picBeds.map(item => { diff --git a/yarn.lock b/yarn.lock index 136e6aa..3fd0654 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2440,6 +2440,13 @@ cross-env@^5.0.5: cross-spawn "^6.0.5" is-windows "^1.0.0" +cross-spawn@^4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41" + dependencies: + lru-cache "^4.0.1" + which "^1.2.9" + cross-spawn@^5.0.1, cross-spawn@^5.1.0: version "5.1.0" resolved "http://registry.npm.taobao.org/cross-spawn/download/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" @@ -2737,6 +2744,10 @@ default-gateway@^2.6.0: execa "^0.10.0" ip-regex "^2.1.0" +default-shell@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/default-shell/-/default-shell-1.0.1.tgz#752304bddc6174f49eb29cb988feea0b8813c8bc" + default-user-agent@^1.0.0: version "1.0.0" resolved "http://registry.npm.taobao.org/default-user-agent/download/default-user-agent-1.0.0.tgz#16c46efdcaba3edc45f24f2bd4868b01b7c2adc6" @@ -3503,6 +3514,18 @@ execa@^0.10.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +execa@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.5.1.tgz#de3fb85cb8d6e91c85bcbceb164581785cb57b36" + dependencies: + cross-spawn "^4.0.0" + get-stream "^2.2.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + execa@^0.7.0: version "0.7.0" resolved "http://registry.npm.taobao.org/execa/download/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" @@ -3821,6 +3844,12 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" +fix-path@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fix-path/-/fix-path-2.1.0.tgz#72ece739de9af4bd63fd02da23e9a70c619b4c38" + dependencies: + shell-path "^2.0.0" + flat-cache@^1.2.1: version "1.3.4" resolved "http://registry.npm.taobao.org/flat-cache/download/flat-cache-1.3.4.tgz#2c2ef77525cc2929007dfffa1dd314aa9c9dee6f" @@ -3998,6 +4027,13 @@ get-stdin@^4.0.1: version "4.0.1" resolved "http://registry.npm.taobao.org/get-stdin/download/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" +get-stream@^2.2.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de" + dependencies: + object-assign "^4.0.1" + pinkie-promise "^2.0.0" + get-stream@^3.0.0: version "3.0.0" resolved "http://registry.npm.taobao.org/get-stream/download/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" @@ -7726,6 +7762,20 @@ shebang-regex@^1.0.0: version "1.0.0" resolved "http://registry.npm.taobao.org/shebang-regex/download/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" +shell-env@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/shell-env/-/shell-env-0.3.0.tgz#2250339022989165bda4eb7bf383afeaaa92dc34" + dependencies: + default-shell "^1.0.0" + execa "^0.5.0" + strip-ansi "^3.0.0" + +shell-path@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/shell-path/-/shell-path-2.1.0.tgz#ea7d06ae1070874a1bac5c65bb9bdd62e4f67a38" + dependencies: + shell-env "^0.3.0" + signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.2" resolved "http://registry.npm.taobao.org/signal-exit/download/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"