diff --git a/src/vs/workbench/contrib/terminal/browser/media/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish b/src/vs/workbench/contrib/terminal/browser/media/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish index a771735ae5207..0377d7000968c 100644 --- a/src/vs/workbench/contrib/terminal/browser/media/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish +++ b/src/vs/workbench/contrib/terminal/browser/media/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish @@ -24,7 +24,7 @@ set --global VSCODE_SHELL_INTEGRATION 1 # Apply any explicit path prefix (see #99878) if status --is-login; and set -q VSCODE_PATH_PREFIX - fish_add_path -p $VSCODE_PATH_PREFIX + set -gx PATH "$VSCODE_PATH_PREFIX$PATH" end set -e VSCODE_PATH_PREFIX diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh index e56630f1b08ad..92c0e07f5ad62 100755 --- a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh +++ b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh @@ -34,7 +34,7 @@ if [ "$VSCODE_INJECTION" == "1" ]; then # Apply any explicit path prefix (see #99878) if [ -n "${VSCODE_PATH_PREFIX:-}" ]; then - export PATH=$VSCODE_PATH_PREFIX$PATH + export PATH="$VSCODE_PATH_PREFIX$PATH" builtin unset VSCODE_PATH_PREFIX fi fi diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-profile.zsh b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-profile.zsh index 5a45b076b2256..c25ded3d7ebfc 100644 --- a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-profile.zsh +++ b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-profile.zsh @@ -2,15 +2,17 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. # --------------------------------------------------------------------------------------------- -if [[ $options[norcs] = off && -o "login" && -f $USER_ZDOTDIR/.zprofile ]]; then - VSCODE_ZDOTDIR=$ZDOTDIR - ZDOTDIR=$USER_ZDOTDIR - . $USER_ZDOTDIR/.zprofile - ZDOTDIR=$VSCODE_ZDOTDIR +if [[ $options[norcs] = off && -o "login" ]]; then + if [[ -f $USER_ZDOTDIR/.zprofile ]]; then + VSCODE_ZDOTDIR=$ZDOTDIR + ZDOTDIR=$USER_ZDOTDIR + . $USER_ZDOTDIR/.zprofile + ZDOTDIR=$VSCODE_ZDOTDIR + fi # Apply any explicit path prefix (see #99878) if (( ${+VSCODE_PATH_PREFIX} )); then - export PATH=$VSCODE_PATH_PREFIX$PATH + export PATH="$VSCODE_PATH_PREFIX$PATH" fi builtin unset VSCODE_PATH_PREFIX fi