Skip to content

Unset SCRIPT_PATH in relocatable activation script #12672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zanieb merged 3 commits into from
Apr 7, 2025
+14 −0
Merged

Unset SCRIPT_PATH in relocatable activation script #12672

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1b7e1f
Use _UV_VENV_ACTIVATOR instead of SCRIPT_PATH in relocatable activati…
charliermarsh Apr 4, 2025
0c7b531
Revert "Use _UV_VENV_ACTIVATOR instead of SCRIPT_PATH in relocatable …
charliermarsh Apr 7, 2025
974ea81
Reset var
charliermarsh Apr 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions crates/uv-virtualenv/src/activator/activate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
# This file must be used with "source bin/activate" *from bash*
# you cannot run it directly

if ! [ -z "${SCRIPT_PATH+_}" ] ; then
_OLD_SCRIPT_PATH="$SCRIPT_PATH"
fi

# Get script path (only used if environment is relocatable).
if [ -n "${BASH_VERSION:+x}" ] ; then
SCRIPT_PATH="${BASH_SOURCE[0]}"
Expand Down Expand Up @@ -80,6 +84,16 @@ if ([ "$OSTYPE" = "cygwin" ] || [ "$OSTYPE" = "msys" ]) && $(command -v cygpath
fi
export VIRTUAL_ENV

# Unset the `SCRIPT_PATH` variable, now that the `VIRTUAL_ENV` variable
# has been set. This is important for relocatable environments.
if ! [ -z "${_OLD_SCRIPT_PATH+_}" ] ; then
SCRIPT_PATH="$_OLD_SCRIPT_PATH"
export SCRIPT_PATH
unset _OLD_SCRIPT_PATH
else
unset SCRIPT_PATH
fi

_OLD_VIRTUAL_PATH="$PATH"
PATH="$VIRTUAL_ENV/{{ BIN_NAME }}:$PATH"
export PATH
Expand Down
Loading