Merge pull request microsoft#182781 from microsoft/tyriar/delimiter

Support : in values for VSCODE_ENV_* variables

Author: Tyriar

src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh

@@ -50,7 +50,7 @@ if [ -n "$VSCODE_ENV_REPLACE" ]; then
 	IFS=':' read -ra ADDR <<< "$VSCODE_ENV_REPLACE"
 	for ITEM in "${ADDR[@]}"; do
 		VARNAME="$(echo $ITEM | cut -d "=" -f 1)"
-		VALUE="$(echo $ITEM | cut -d "=" -f 2)"
+		VALUE="$(echo -e "$ITEM" | cut -d "=" -f 2)"
 		export $VARNAME="$VALUE"
 	done
 	builtin unset VSCODE_ENV_REPLACE
@@ -59,7 +59,7 @@ if [ -n "$VSCODE_ENV_PREPEND" ]; then
 	IFS=':' read -ra ADDR <<< "$VSCODE_ENV_PREPEND"
 	for ITEM in "${ADDR[@]}"; do
 		VARNAME="$(echo $ITEM | cut -d "=" -f 1)"
-		VALUE="$(echo $ITEM | cut -d "=" -f 2)"
+		VALUE="$(echo -e "$ITEM" | cut -d "=" -f 2)"
 		export $VARNAME="$VALUE${!VARNAME}"
 	done
 	builtin unset VSCODE_ENV_PREPEND
@@ -68,7 +68,7 @@ if [ -n "$VSCODE_ENV_APPEND" ]; then
 	IFS=':' read -ra ADDR <<< "$VSCODE_ENV_APPEND"
 	for ITEM in "${ADDR[@]}"; do
 		VARNAME="$(echo $ITEM | cut -d "=" -f 1)"
-		VALUE="$(echo $ITEM | cut -d "=" -f 2)"
+		VALUE="$(echo -e "$ITEM" | cut -d "=" -f 2)"
 		export $VARNAME="${!VARNAME}$VALUE"
 	done
 	builtin unset VSCODE_ENV_APPEND

src/vs/workbench/contrib/terminal/browser/media/shellIntegration-rc.zsh

@@ -40,29 +40,26 @@ fi
 
 # Apply EnvironmentVariableCollections if needed
 if [ -n "$VSCODE_ENV_REPLACE" ]; then
-	echo "VSCODE_ENV_REPLACE: $VSCODE_ENV_REPLACE"
 	IFS=':' read -rA ADDR <<< "$VSCODE_ENV_REPLACE"
 	for ITEM in "${ADDR[@]}"; do
 		VARNAME="$(echo ${ITEM%%=*})"
-		export $VARNAME="${ITEM#*=}"
+		export $VARNAME="$(echo -e ${ITEM#*=})"
 	done
 	unset VSCODE_ENV_REPLACE
 fi
 if [ -n "$VSCODE_ENV_PREPEND" ]; then
-	echo "VSCODE_ENV_PREPEND: $VSCODE_ENV_PREPEND"
 	IFS=':' read -rA ADDR <<< "$VSCODE_ENV_PREPEND"
 	for ITEM in "${ADDR[@]}"; do
 		VARNAME="$(echo ${ITEM%%=*})"
-		export $VARNAME="${ITEM#*=}${(P)VARNAME}"
+		export $VARNAME="$(echo -e {ITEM#*=})${(P)VARNAME}"
 	done
 	unset VSCODE_ENV_PREPEND
 fi
 if [ -n "$VSCODE_ENV_APPEND" ]; then
-	echo "VSCODE_ENV_APPEND: $VSCODE_ENV_APPEND"
 	IFS=':' read -rA ADDR <<< "$VSCODE_ENV_APPEND"
 	for ITEM in "${ADDR[@]}"; do
 		VARNAME="$(echo ${ITEM%%=*})"
-		export $VARNAME="${(P)VARNAME}${ITEM#*=}"
+		export $VARNAME="${(P)VARNAME}$(echo -e {ITEM#*=})"
 	done
 	unset VSCODE_ENV_APPEND
 fi

src/vs/workbench/contrib/terminal/browser/media/shellIntegration.fish

@@ -33,23 +33,23 @@ if test -n "$VSCODE_ENV_REPLACE"
 	set ITEMS (string split : $VSCODE_ENV_REPLACE)
 	for B in $ITEMS
 		set split (string split = $B)
-		set -gx "$split[1]" "$split[2]"
+		set -gx "$split[1]" (echo -e "$split[2]")
 	end
 	set -e VSCODE_ENV_REPLACE
 end
 if test -n "$VSCODE_ENV_PREPEND"
 	set ITEMS (string split : $VSCODE_ENV_PREPEND)
 	for B in $ITEMS
 		set split (string split = $B)
-		set -gx "$split[1]" "$split[2]$$split[1]" # avoid -p as it adds a space
+		set -gx "$split[1]" (echo -e "$split[2]")"$$split[1]" # avoid -p as it adds a space
 	end
 	set -e VSCODE_ENV_PREPEND
 end
 if test -n "$VSCODE_ENV_APPEND"
 	set ITEMS (string split : $VSCODE_ENV_APPEND)
 	for B in $ITEMS
 		set split (string split = $B)
-		set -gx "$split[1]" "$$split[1]$split[2]" # avoid -a as it adds a space
+		set -gx "$split[1]" "$$split[1]"(echo -e "$split[2]") # avoid -a as it adds a space
 	end
 	set -e VSCODE_ENV_APPEND
 end

src/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1

@@ -25,23 +25,23 @@ if ($env:VSCODE_ENV_REPLACE) {
 	$Split = $env:VSCODE_ENV_REPLACE.Split(":")
 	foreach ($Item in $Split) {
 		$Inner = $Item.Split('=')
-		[Environment]::SetEnvironmentVariable($Inner[0], $Inner[1])
+		[Environment]::SetEnvironmentVariable($Inner[0], $Inner[1].Replace('\x3a', ':'))
 	}
 	$env:VSCODE_ENV_REPLACE = $null
 }
 if ($env:VSCODE_ENV_PREPEND) {
 	$Split = $env:VSCODE_ENV_PREPEND.Split(":")
 	foreach ($Item in $Split) {
 		$Inner = $Item.Split('=')
-		[Environment]::SetEnvironmentVariable($Inner[0], $Inner[1] + [Environment]::GetEnvironmentVariable($Inner[0]))
+		[Environment]::SetEnvironmentVariable($Inner[0], $Inner[1].Replace('\x3a', ':') + [Environment]::GetEnvironmentVariable($Inner[0]))
 	}
 	$env:VSCODE_ENV_PREPEND = $null
 }
 if ($env:VSCODE_ENV_APPEND) {
 	$Split = $env:VSCODE_ENV_APPEND.Split(":")
 	foreach ($Item in $Split) {
 		$Inner = $Item.Split('=')
-		[Environment]::SetEnvironmentVariable($Inner[0], [Environment]::GetEnvironmentVariable($Inner[0]) + $Inner[1])
+		[Environment]::SetEnvironmentVariable($Inner[0], [Environment]::GetEnvironmentVariable($Inner[0]) + $Inner[1].Replace('\x3a', ':'))
 	}
 	$env:VSCODE_ENV_APPEND = $null
 }