if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2024-12-28 09:51:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

SDA-3731 shell-path upgrade

Browse Source
This commit is contained in:
sbenmoussati 2022-05-31 17:46:24 +02:00 committed by Salah Benmoussati
parent 266e7a3aee
commit 17edd19a71
3 changed files with 119 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
package-lock.json generated
View File

@ -2410,7 +2410,8 @@
"ansi-regex": {
"version": "2.1.1",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/ansi-regex/-/ansi-regex-2.1.1.tgz",
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
"dev": true
},
"ansi-styles": {
"version": "4.3.0",
@ -5136,27 +5137,40 @@
}
},
"cross-spawn": {
"version": "4.0.2",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/cross-spawn/-/cross-spawn-4.0.2.tgz",
"integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
"requires": {
"lru-cache": "^4.0.1",
"which": "^1.2.9"
"path-key": "^3.1.0",
"shebang-command": "^2.0.0",
"which": "^2.0.1"
},
"dependencies": {
"lru-cache": {
"version": "4.1.5",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/lru-cache/-/lru-cache-4.1.5.tgz",
"integrity": "sha1-i75Q6oW+1ZvJ4z3KuCNe6bz0Q80=",
"path-key": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
},
"shebang-command": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
"requires": {
"pseudomap": "^1.0.2",
"yallist": "^2.1.2"
"shebang-regex": "^3.0.0"
}
},
"yallist": {
"version": "2.1.2",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/yallist/-/yallist-2.1.2.tgz",
"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
"shebang-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
},
"which": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"requires": {
"isexe": "^2.0.0"
}
}
}
},
@ -5463,9 +5477,9 @@
"dev": true
},
"default-shell": {
"version": "1.0.1",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/default-shell/-/default-shell-1.0.1.tgz",
"integrity": "sha1-dSMEvdxhdPSespy5iP7qC4gTyLw="
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/default-shell/-/default-shell-2.2.0.tgz",
"integrity": "sha512-sPpMZcVhRQ0nEMDtuMJ+RtCxt7iHPAMBU+I4tAlo5dU1sjRpNax0crj6nR3qKpvVnckaQ9U38enXcwW9nZJeCw=="
},
"defaults": {
"version": "1.0.3",
@ -7332,17 +7346,44 @@
"dev": true
},
"execa": {
"version": "0.5.1",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/execa/-/execa-0.5.1.tgz",
"integrity": "sha1-3j+4XLjW6RyFvLzrFkWBeFy1ezY=",
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
"requires": {
"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"
"cross-spawn": "^7.0.3",
"get-stream": "^6.0.0",
"human-signals": "^2.1.0",
"is-stream": "^2.0.0",
"merge-stream": "^2.0.0",
"npm-run-path": "^4.0.1",
"onetime": "^5.1.2",
"signal-exit": "^3.0.3",
"strip-final-newline": "^2.0.0"
},
"dependencies": {
"human-signals": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
},
"is-stream": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
},
"npm-run-path": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
"requires": {
"path-key": "^3.0.0"
}
},
"path-key": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
}
}
},
"exif-parser": {
@ -8362,13 +8403,9 @@
"dev": true
},
"get-stream": {
"version": "2.3.1",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/get-stream/-/get-stream-2.3.1.tgz",
"integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
"requires": {
"object-assign": "^4.0.1",
"pinkie-promise": "^2.0.0"
}
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
},
"get-symbol-from-current-process-h": {
"version": "1.0.2",
@ -10305,7 +10342,8 @@
"is-stream": {
"version": "1.1.0",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/is-stream/-/is-stream-1.1.0.tgz",
"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
"dev": true
},
"is-string": {
"version": "1.0.5",
@ -12436,8 +12474,7 @@
"merge-stream": {
"version": "2.0.0",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/merge-stream/-/merge-stream-2.0.0.tgz",
"integrity": "sha1-UoI2KaFN0AyXcPtq1H3GMQ8sH2A=",
"dev": true
"integrity": "sha1-UoI2KaFN0AyXcPtq1H3GMQ8sH2A="
},
"merge2": {
"version": "1.4.1",
@ -12496,8 +12533,7 @@
"mimic-fn": {
"version": "2.1.0",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/mimic-fn/-/mimic-fn-2.1.0.tgz",
"integrity": "sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs=",
"dev": true
"integrity": "sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs="
},
"mimic-response": {
"version": "1.0.1",
@ -13260,6 +13296,7 @@
"version": "2.0.2",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/npm-run-path/-/npm-run-path-2.0.2.tgz",
"integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
"dev": true,
"requires": {
"path-key": "^2.0.0"
}
@ -13489,7 +13526,6 @@
"version": "5.1.2",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/onetime/-/onetime-5.1.2.tgz",
"integrity": "sha1-0Oluu1awdHbfHdnEgG5SN5hcpF4=",
"dev": true,
"requires": {
"mimic-fn": "^2.1.0"
}
@ -13649,7 +13685,8 @@
"p-finally": {
"version": "1.0.0",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/p-finally/-/p-finally-1.0.0.tgz",
"integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
"integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
"dev": true
},
"p-limit": {
"version": "2.3.0",
@ -13861,7 +13898,8 @@
"path-key": {
"version": "2.0.1",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/path-key/-/path-key-2.0.1.tgz",
"integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
"integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
"dev": true
},
"path-parse": {
"version": "1.0.6",
@ -14020,12 +14058,14 @@
"pinkie": {
"version": "2.0.4",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/pinkie/-/pinkie-2.0.4.tgz",
"integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
"integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
"dev": true
},
"pinkie-promise": {
"version": "2.0.1",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
"dev": true,
"requires": {
"pinkie": "^2.0.0"
}
@ -14539,7 +14579,8 @@
"pseudomap": {
"version": "1.0.2",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/pseudomap/-/pseudomap-1.0.2.tgz",
"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
"dev": true
},
"psl": {
"version": "1.8.0",
@ -15903,21 +15944,36 @@
"dev": true
},
"shell-env": {
"version": "0.3.0",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/shell-env/-/shell-env-0.3.0.tgz",
"integrity": "sha1-IlAzkCKYkWW9pOt784Ov6qqS3DQ=",
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/shell-env/-/shell-env-4.0.1.tgz",
"integrity": "sha512-w3oeZ9qg/P6Lu6qqwavvMnB/bwfsz67gPB3WXmLd/n6zuh7TWQZtGa3iMEdmua0kj8rivkwl+vUjgLWlqZOMPw==",
"requires": {
"default-shell": "^1.0.0",
"execa": "^0.5.0",
"strip-ansi": "^3.0.0"
"default-shell": "^2.0.0",
"execa": "^5.1.1",
"strip-ansi": "^7.0.1"
},
"dependencies": {
"ansi-regex": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="
},
"strip-ansi": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
"integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
"requires": {
"ansi-regex": "^6.0.1"
}
}
}
},
"shell-path": {
"version": "2.1.0",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/shell-path/-/shell-path-2.1.0.tgz",
"integrity": "sha1-6n0GrhBwh0obrFxlu5vdYuT2ejg=",
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/shell-path/-/shell-path-3.0.0.tgz",
"integrity": "sha512-HNIZ+W/3P0JuVTV03xjGqYKt3e3h0/Z4AH8TQWeth1LBtCusSjICgkdNdb3VZr6mI7ijE2AiFFpgkVMNKsALeQ==",
"requires": {
"shell-env": "^0.3.0"
"shell-env": "^4.0.0"
}
},
"shell-quote": {
@ -16739,6 +16795,7 @@
"version": "3.0.1",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@ -16767,13 +16824,13 @@
"strip-eof": {
"version": "1.0.0",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/strip-eof/-/strip-eof-1.0.0.tgz",
"integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
"integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
"dev": true
},
"strip-final-newline": {
"version": "2.0.0",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
"integrity": "sha1-ibhS+y/L6Tb29LMYevsKEsGrWK0=",
"dev": true
"integrity": "sha1-ibhS+y/L6Tb29LMYevsKEsGrWK0="
},
"strip-indent": {
"version": "2.0.0",
@ -18660,6 +18717,7 @@
"version": "1.3.1",
"resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/which/-/which-1.3.1.tgz",
"integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=",
"dev": true,
"requires": {
"isexe": "^2.0.0"
}

2
package.json
View File

@ -171,7 +171,7 @@
"ref-napi": "1.4.3",
"rimraf": "^3.0.2",
"save-svg-as-png": "^1.4.17",
"shell-path": "2.1.0"
"shell-path": "^3.0.0"
},
"optionalDependencies": {
"auto-update": "file:auto_update",

2
src/app/main.ts
View File

@ -1,6 +1,5 @@
import { app, systemPreferences } from 'electron';
import * as electronDownloader from 'electron-dl';
import * as shellPath from 'shell-path';
import { isDevEnv, isLinux, isMac } from '../common/env';
import { logger } from '../common/logger';
@ -34,6 +33,7 @@ let isAppAlreadyOpen: boolean = false;
// Setting the env path child_process issue https://github.com/electron/electron/issues/7688
(async () => {
try {
const shellPath = await import('shell-path');
const paths = await shellPath();
if (paths) {
return (process.env.PATH = paths);