Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-31 04:35:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #223421 from anton-matosov/fix-path-prefix-in-shell-integrations

Browse Source 
A followup to #171066 fixing zsh and fish shells implementations
This commit is contained in:
Daniel Imms
2024-07-26 09:23:56 -07:00
committed by GitHub
parent 567753bc7a 140b61b6c3
commit 9d97e5efb9
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/terminal/browser/media/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish
+1 -1
View File
@@ -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
src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh
+1 -1
View File
@@ -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
src/vs/workbench/contrib/terminal/browser/media/shellIntegration-profile.zsh
+8 -6
View File
@@ -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