Use BIN_NAME in activation scripts

astral-sh · Feb 17, 2024 · 2a76c59 · 2a76c59
1 parent 340cb67
commit 2a76c59
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/crates/gourgeist/src/activator/activate b/crates/gourgeist/src/activator/activate
@@ -52,7 +52,7 @@ fi
 export VIRTUAL_ENV
 
 _OLD_VIRTUAL_PATH="$PATH"
-PATH="$VIRTUAL_ENV/bin:$PATH"
+PATH="$VIRTUAL_ENV/{{ BIN_NAME }}:$PATH"
 export PATH
 
 if [ "x" != x ] ; then

diff --git a/crates/gourgeist/src/activator/activate.csh b/crates/gourgeist/src/activator/activate.csh
@@ -13,7 +13,7 @@ deactivate nondestructive
 setenv VIRTUAL_ENV '{{ VIRTUAL_ENV_DIR }}'
 
 set _OLD_VIRTUAL_PATH="$PATH:q"
-setenv PATH "$VIRTUAL_ENV:q/bin:$PATH:q"
+setenv PATH "$VIRTUAL_ENV:q/{{ BIN_NAME }}:$PATH:q"
 
 
 

diff --git a/crates/gourgeist/src/activator/activate.fish b/crates/gourgeist/src/activator/activate.fish
@@ -66,7 +66,7 @@ if test (echo $FISH_VERSION | head -c 1) -lt 3
 else
     set -gx _OLD_VIRTUAL_PATH $PATH
 end
-set -gx PATH "$VIRTUAL_ENV"'/bin' $PATH
+set -gx PATH "$VIRTUAL_ENV"'/{{ BIN_NAME }}' $PATH
 
 # Prompt override provided?
 # If not, just use the environment name.

diff --git a/crates/gourgeist/src/activator/activate.nu b/crates/gourgeist/src/activator/activate.nu
@@ -33,7 +33,7 @@ export-env {
     }
 
     let virtual_env = '{{ VIRTUAL_ENV_DIR }}'
-    let bin = 'bin'
+    let bin = '{{ BIN_NAME }}'
 
     let is_windows = ($nu.os-info.family) == 'windows'
     let path_name = (if (has-env 'Path') {

diff --git a/crates/gourgeist/src/activator/activate_this.py b/crates/gourgeist/src/activator/activate_this.py
@@ -18,7 +18,7 @@
     raise AssertionError(msg) from exc
 
 bin_dir = os.path.dirname(abs_file)
-base = bin_dir[: -len("bin") - 1]  # strip away the bin part from the __file__, plus the path separator
+base = bin_dir[: -len("{{ BIN_NAME }}") - 1]  # strip away the bin part from the __file__, plus the path separator
 
 # prepend bin to PATH (this file is inside the bin directory)
 os.environ["PATH"] = os.pathsep.join([bin_dir, *os.environ.get("PATH", "").split(os.pathsep)])