Skip to content

Commit 8099915

Browse files
mguzmanmedriouk
andauthored
Fix Windows merge command quoting and harden CLI execution (#116)
* Remove shellQuote * Fix Windows merge command quoting and harden CLI execution * Add unit tests * Restructure unit tests * Remove shellQuote references and propagate console error messages to the GUI * Add missing file --------- Co-authored-by: Evgueni Driouk <edriouk@arm.com>
1 parent 0cad6d1 commit 8099915

5 files changed

Lines changed: 320 additions & 57 deletions

File tree

docs/third-party-licenses.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -237,13 +237,6 @@
237237
"url": "https://github.com/isaacs/node-glob",
238238
"license": "https://github.com/isaacs/node-glob/blob/main/LICENSE.md"
239239
},
240-
{
241-
"name": "shell-quote",
242-
"version": "1.8.3",
243-
"spdx": "MIT",
244-
"url": "https://github.com/ljharb/shell-quote",
245-
"license": "https://github.com/ljharb/shell-quote/blob/main/LICENSE"
246-
},
247240
{
248241
"name": "tmp",
249242
"version": "0.2.5",

package-lock.json

Lines changed: 1 addition & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@
9797
"react-window": "^1.8.11",
9898
"sax-ts": "^1.2.13",
9999
"semver": "^7.7.4",
100-
"shell-quote": "^1.8.3",
101100
"tcp-port-used": "^1.0.2",
102101
"tmp": "^0.2.5",
103102
"vscode-jsonrpc": "^8.2.1",
@@ -134,7 +133,6 @@
134133
"@types/react-dom": "^18.3.1",
135134
"@types/react-window": "^1.8.8",
136135
"@types/semver": "^7.7.1",
137-
"@types/shell-quote": "^1.7.5",
138136
"@types/targz": "^1.0.5",
139137
"@types/tcp-port-used": "^1.0.4",
140138
"@types/tmp": "^0.2.6",

0 commit comments

Comments
 (0)