Fix opening files with spaces via CLI on Linux

Tyriar · Tyriar · commit b6095e9d859f · 2016-05-20T15:42:44.000-07:00
Fixes microsoft#6525
diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh
@@ -3,8 +3,6 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
 
-ARGS=$@
-
 # If root, ensure that --user-data-dir is specified
 if [ "$(id -u)" = "0" ]; then
 	while test $# -gt 0
@@ -35,5 +33,5 @@ fi
 
 ELECTRON="$VSCODE_PATH/@@NAME@@"
 CLI="$VSCODE_PATH/resources/app/out/cli.js"
-ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 "$ELECTRON" "$CLI" $ARGS
+ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
 exit $?
diff --git a/scripts/code-cli.sh b/scripts/code-cli.sh
@@ -31,7 +31,8 @@ function code() {
 	VSCODE_DEV=1 \
 	ELECTRON_ENABLE_LOGGING=1 \
 	ELECTRON_ENABLE_STACK_DUMPING=1 \
-	"$ELECTRON" "$CLI" . $@
+	echo $@
+	"$ELECTRON" "$CLI" . "$@"
 }
 
 code "$@"

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ function code() {`
`31`	`31`	`VSCODE_DEV=1 \`
`32`	`32`	`ELECTRON_ENABLE_LOGGING=1 \`
`33`	`33`	`ELECTRON_ENABLE_STACK_DUMPING=1 \`
`34`		`- "$ELECTRON" "$CLI" . $@`
	`34`	`+ echo $@`
	`35`	`+ "$ELECTRON" "$CLI" . "$@"`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`code "$@"`