mirror of
https://github.com/Microsoft/vscode
synced 2024-10-30 11:10:48 +00:00
Resolved regression in WSL launch script
This commit is contained in:
parent
059a3e1642
commit
e44a5ce145
1 changed files with 26 additions and 9 deletions
|
@ -6,11 +6,23 @@ COMMIT="@@COMMIT@@"
|
||||||
APP_NAME="@@APPNAME@@"
|
APP_NAME="@@APPNAME@@"
|
||||||
QUALITY="@@QUALITY@@"
|
QUALITY="@@QUALITY@@"
|
||||||
NAME="@@NAME@@"
|
NAME="@@NAME@@"
|
||||||
|
VSCODE_PATH="$(dirname "$(dirname "$(realpath "$0")")")"
|
||||||
|
ELECTRON="$VSCODE_PATH/$NAME.exe"
|
||||||
if grep -qi Microsoft /proc/version; then
|
if grep -qi Microsoft /proc/version; then
|
||||||
# in a wsl shell
|
# in a wsl shell
|
||||||
|
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")
|
WIN_CODE_CMD=$(wslpath -w "$(dirname "$(realpath "$0")")/$APP_NAME.cmd")
|
||||||
if ! [ -z "$WIN_CODE_CMD" ]; then
|
|
||||||
# make sure the cwd is in the windows fs, otherwise there will be a warning from cmd
|
# make sure the cwd is in the windows fs, otherwise there will be a warning from cmd
|
||||||
pushd "$(dirname "$0")" > /dev/null
|
pushd "$(dirname "$0")" > /dev/null
|
||||||
WSL_EXT_ID="ms-vscode.remote-wsl"
|
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=$(wslpath -u "${WSL_EXT_WLOC%%[[:cntrl:]]}")/scripts/wslCode.sh
|
||||||
"$WSL_CODE" $COMMIT $QUALITY "$WIN_CODE_CMD" "$APP_NAME" "$@"
|
"$WSL_CODE" $COMMIT $QUALITY "$WIN_CODE_CMD" "$APP_NAME" "$@"
|
||||||
exit $?
|
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
|
fi
|
||||||
|
else
|
||||||
|
fallback "$@"
|
||||||
fi
|
fi
|
||||||
fi
|
elif [ -x "$(command -v cygpath)" ]; then
|
||||||
|
|
||||||
VSCODE_PATH="$(dirname "$(dirname "$(realpath "$0")")")"
|
|
||||||
|
|
||||||
if [ -x "$(command -v cygpath)" ]; then
|
|
||||||
CLI=$(cygpath -m "$VSCODE_PATH/resources/app/out/cli.js")
|
CLI=$(cygpath -m "$VSCODE_PATH/resources/app/out/cli.js")
|
||||||
else
|
else
|
||||||
CLI="$VSCODE_PATH/resources/app/out/cli.js"
|
CLI="$VSCODE_PATH/resources/app/out/cli.js"
|
||||||
fi
|
fi
|
||||||
ELECTRON="$VSCODE_PATH/$NAME.exe"
|
|
||||||
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
|
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
|
||||||
exit $?
|
exit $?
|
Loading…
Reference in a new issue