development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-30 13:43:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #72779 from xtydev/master

Browse source 
Resolve regression in WSL launch script
This commit is contained in:
Martin Aeschlimann 2019-04-24 10:25:38 +01:00 committed by GitHub
commit b6e891367b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
resources/win32/bin/code.sh
View file

@ -6,11 +6,23 @@ COMMIT="@@COMMIT@@"
APP_NAME="@@APPNAME@@"
QUALITY="@@QUALITY@@"
NAME="@@NAME@@"
VSCODE_PATH="$(dirname "$(dirname "$(realpath "$0")")")"
ELECTRON="$VSCODE_PATH/$NAME.exe"
if grep -qi Microsoft /proc/version; then
# in a wsl shell
WIN_CODE_CMD=$(wslpath -w "$(dirname "$(realpath "$0")")/$APP_NAME.cmd")
if ! [ -z "$WIN_CODE_CMD" ]; then
fallback() {
# If running under older WSL, don't pass cli.js to Electron as
# environment vars cannot be transferred from WSL to Windows
# See: https://github.com/Microsoft/BashOnWindows/issues/1363
# https://github.com/Microsoft/BashOnWindows/issues/1494
"$ELECTRON" "$@"
exit $?
}
WSL_BUILD=$(uname -r | sed -E 's/^.+-([0-9]+)-Microsoft/\1/')
# wslpath is not available prior to WSL build 17046
# See: https://docs.microsoft.com/en-us/windows/wsl/release-notes#build-17046
if [ -x /bin/wslpath ]; then
WIN_CODE_CMD=$(wslpath -w "$(dirname "$(realpath "$0")")/$APP_NAME.cmd")
# make sure the cwd is in the windows fs, otherwise there will be a warning from cmd
pushd "$(dirname "$0")" > /dev/null
WSL_EXT_ID="ms-vscode.remote-wsl"
@ -21,17 +33,22 @@ if grep -qi Microsoft /proc/version; then
WSL_CODE=$(wslpath -u "${WSL_EXT_WLOC%%[[:cntrl:]]}")/scripts/wslCode.sh
"$WSL_CODE" $COMMIT $QUALITY "$WIN_CODE_CMD" "$APP_NAME" "$@"
exit $?
elif [ $WSL_BUILD -ge 17063 ] 2> /dev/null; then
# Since WSL build 17063, we just need to set WSLENV so that
# ELECTRON_RUN_AS_NODE is visible to the win32 process
# See: https://docs.microsoft.com/en-us/windows/wsl/release-notes#build-17063
export WSLENV=ELECTRON_RUN_AS_NODE/w:$WSLENV
CLI=$(wslpath -m "$VSCODE_PATH/resources/app/out/cli.js")
else # $WSL_BUILD ∈ [17046, 17063) OR $WSL_BUILD is indeterminate
fallback "$@"
fi
else
fallback "$@"
fi
fi
VSCODE_PATH="$(dirname "$(dirname "$(realpath "$0")")")"
if [ -x "$(command -v cygpath)" ]; then
elif [ -x "$(command -v cygpath)" ]; then
CLI=$(cygpath -m "$VSCODE_PATH/resources/app/out/cli.js")
else
CLI="$VSCODE_PATH/resources/app/out/cli.js"
fi
ELECTRON="$VSCODE_PATH/$NAME.exe"
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
exit $?