|
1 | 1 | import * as crypto from 'crypto';
|
| 2 | +import { isAbsolute } from 'path'; |
2 | 3 | import Log from './common/logger';
|
3 | 4 | import { getVSCodeServerConfig } from './serverConfig';
|
4 | 5 | import SSHConnection from './ssh/sshConnection';
|
@@ -213,7 +214,7 @@ DISTRO_VSCODIUM_RELEASE="${release ?? ''}"
|
213 | 214 | SERVER_APP_NAME="${serverApplicationName}"
|
214 | 215 | SERVER_INITIAL_EXTENSIONS="${extensions}"
|
215 | 216 | SERVER_LISTEN_FLAG="${useSocketPath ? `--socket-path="$TMP_DIR/vscode-server-sock-${crypto.randomUUID()}"` : '--port=0'}"
|
216 |
| -SERVER_DATA_DIR="$HOME/${serverDataFolderName}" |
| 217 | +SERVER_DATA_DIR="${(isAbsolute(serverDataFolderName) ? '' : '$HOME/') + serverDataFolderName}" |
217 | 218 | SERVER_DIR="$SERVER_DATA_DIR/bin/$DISTRO_COMMIT"
|
218 | 219 | SERVER_SCRIPT="$SERVER_DIR/bin/$SERVER_APP_NAME"
|
219 | 220 | SERVER_LOGFILE="$SERVER_DATA_DIR/.$DISTRO_COMMIT.log"
|
@@ -368,7 +369,7 @@ if [[ -z $SERVER_RUNNING_PROCESS ]]; then
|
368 | 369 | SERVER_CONNECTION_TOKEN="${crypto.randomUUID()}"
|
369 | 370 | echo $SERVER_CONNECTION_TOKEN > $SERVER_TOKENFILE
|
370 | 371 |
|
371 |
| - $SERVER_SCRIPT --start-server --host=127.0.0.1 $SERVER_LISTEN_FLAG $SERVER_INITIAL_EXTENSIONS --connection-token-file $SERVER_TOKENFILE --telemetry-level off --enable-remote-auto-shutdown --accept-server-license-terms &> $SERVER_LOGFILE & |
| 372 | + $SERVER_SCRIPT --start-server --host=127.0.0.1 $SERVER_LISTEN_FLAG $SERVER_INITIAL_EXTENSIONS --connection-token-file $SERVER_TOKENFILE --telemetry-level off --enable-remote-auto-shutdown --accept-server-license-terms --server-data-dir $SERVER_DATA_DIR &> $SERVER_LOGFILE & |
372 | 373 | echo $! > $SERVER_PIDFILE
|
373 | 374 | else
|
374 | 375 | echo "Server script is already running $SERVER_SCRIPT"
|
@@ -427,7 +428,7 @@ $DISTRO_VSCODIUM_RELEASE="${release ?? ''}"
|
427 | 428 | $SERVER_APP_NAME="${serverApplicationName}"
|
428 | 429 | $SERVER_INITIAL_EXTENSIONS="${extensions}"
|
429 | 430 | $SERVER_LISTEN_FLAG="${useSocketPath ? `--socket-path="$TMP_DIR/vscode-server-sock-${crypto.randomUUID()}"` : '--port=0'}"
|
430 |
| -$SERVER_DATA_DIR="$(Resolve-Path ~)\\${serverDataFolderName}" |
| 431 | +$SERVER_DATA_DIR="${(isAbsolute(serverDataFolderName) ? '' : '$(Resolve-Path ~)\\') + serverDataFolderName}" |
431 | 432 | $SERVER_DIR="$SERVER_DATA_DIR\\bin\\$DISTRO_COMMIT"
|
432 | 433 | $SERVER_SCRIPT="$SERVER_DIR\\bin\\$SERVER_APP_NAME.cmd"
|
433 | 434 | $SERVER_LOGFILE="$SERVER_DATA_DIR\\.$DISTRO_COMMIT.log"
|
@@ -533,7 +534,7 @@ else {
|
533 | 534 | $SERVER_CONNECTION_TOKEN="${crypto.randomUUID()}"
|
534 | 535 | [System.IO.File]::WriteAllLines($SERVER_TOKENFILE, $SERVER_CONNECTION_TOKEN)
|
535 | 536 |
|
536 |
| - $SCRIPT_ARGUMENTS="--start-server --host=127.0.0.1 $SERVER_LISTEN_FLAG $SERVER_INITIAL_EXTENSIONS --connection-token-file $SERVER_TOKENFILE --telemetry-level off --enable-remote-auto-shutdown --accept-server-license-terms *> '$SERVER_LOGFILE'" |
| 537 | + $SCRIPT_ARGUMENTS="--start-server --host=127.0.0.1 $SERVER_LISTEN_FLAG $SERVER_INITIAL_EXTENSIONS --connection-token-file $SERVER_TOKENFILE --telemetry-level off --enable-remote-auto-shutdown --accept-server-license-terms --server-data-dir $SERVER_DATA_DIR *> '$SERVER_LOGFILE'" |
537 | 538 |
|
538 | 539 | $START_ARGUMENTS = @{
|
539 | 540 | FilePath = "powershell.exe"
|
|
0 commit comments