Workaround for broken WSL2 in Win build 18947. For #77898

aeschli · aeschli · commit df880b0434db · 2019-08-23T15:36:14.000+02:00
diff --git a/resources/win32/bin/code.sh b/resources/win32/bin/code.sh
@@ -11,14 +11,9 @@ VSCODE_PATH="$(dirname "$(dirname "$(realpath "$0")")")"
 ELECTRON="$VSCODE_PATH/$NAME.exe"
 if grep -qi Microsoft /proc/version; then
 	# in a wsl shell
-	if [ "$WSL_DISTRO_NAME" ]; then
-		# $WSL_DISTRO_NAME is available since WSL builds 18362, also for WSL2
-		WSL_BUILD=18362
-	else
-		WSL_BUILD=$(uname -r | sed -E 's/^.+-([0-9]+)-Microsoft/\1/')
-		if [ -z "$WSL_BUILD" ]; then
-			WSL_BUILD=0
-		fi
+	WSL_BUILD=$(uname -r | sed -E 's/^[0-9.]+-([0-9]+)-Microsoft|([0-9]+).([0-9]+).([0-9]+)-microsoft-standard|.*/\1\2\3\4/')
+	if [ -z "$WSL_BUILD" ]; then
+		WSL_BUILD=0
 	fi
 
 	if [ $WSL_BUILD -ge 17063 ]; then
@@ -30,7 +25,18 @@ if grep -qi Microsoft /proc/version; then
 
 		# use the Remote WSL extension if installed
 		WSL_EXT_ID="ms-vscode-remote.remote-wsl"
-		WSL_EXT_WLOC=$(ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" --locate-extension $WSL_EXT_ID)
+
+		if [ $WSL_BUILD -ge 41955 ]; then
+			# WSL2 in workaround for https://github.com/microsoft/WSL/issues/4337
+			CWD="$(pwd)"
+			cd "$VSCODE_PATH"
+			cmd.exe /C ".\\bin\\$APP_NAME.cmd --locate-extension $WSL_EXT_ID >remote-wsl-loc.txt"
+			WSL_EXT_WLOC="$(cat ./remote-wsl-loc.txt)"
+			rm remote-wsl-loc.txt
+			cd "$CWD"
+		else
+			WSL_EXT_WLOC=$(ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" --locate-extension $WSL_EXT_ID)
+		fi
 		if [ -n "$WSL_EXT_WLOC" ]; then
 			# replace \r\n with \n in WSL_EXT_WLOC
 			WSL_CODE=$(wslpath -u "${WSL_EXT_WLOC%%[[:cntrl:]]}")/scripts/wslCode.sh
