From d9f91002d40deaf45aefee9563cb8096aea7a23b Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Mon, 24 Jan 2022 14:43:30 +0100 Subject: [PATCH] wsl code: pass SERVERDATAFOLDER --- build/gulpfile.vscode.js | 2 +- resources/win32/bin/code.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index 1a9ebb39097..8a69232956e 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -323,7 +323,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op .pipe(replace('@@VERSION@@', version)) .pipe(replace('@@COMMIT@@', commit)) .pipe(replace('@@APPNAME@@', product.applicationName)) - .pipe(replace('@@DATAFOLDER@@', product.dataFolderName)) + .pipe(replace('@@SERVERDATAFOLDER@@', product.serverDataFolderName || '.vscode-remote')) .pipe(replace('@@QUALITY@@', quality)) .pipe(rename(function (f) { f.basename = product.applicationName; f.extname = ''; }))); diff --git a/resources/win32/bin/code.sh b/resources/win32/bin/code.sh index 999a5b5445c..a56c068f4ac 100644 --- a/resources/win32/bin/code.sh +++ b/resources/win32/bin/code.sh @@ -10,7 +10,7 @@ COMMIT="@@COMMIT@@" APP_NAME="@@APPNAME@@" QUALITY="@@QUALITY@@" NAME="@@NAME@@" -DATAFOLDER="@@DATAFOLDER@@" +SERVERDATAFOLDER="@@SERVERDATAFOLDER@@" VSCODE_PATH="$(dirname "$(dirname "$(realpath "$0")")")" ELECTRON="$VSCODE_PATH/$NAME.exe" @@ -49,7 +49,7 @@ if [ $IN_WSL = true ]; then 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 - "$WSL_CODE" "$COMMIT" "$QUALITY" "$ELECTRON" "$APP_NAME" "$DATAFOLDER" "$@" + "$WSL_CODE" "$COMMIT" "$QUALITY" "$ELECTRON" "$APP_NAME" "$SERVERDATAFOLDER" "$@" exit $? fi