fish: Add and use $PYTHON_SETUP_FOLDER

Signed-off-by: Nathan Chancellor <[email protected]>
nathanchance · Dec 8, 2024 · 3ec1d31 · 3ec1d31
1 parent 4bf3aad
commit 3ec1d31
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/fish/conf.d/variables.fish b/fish/conf.d/variables.fish
@@ -155,6 +155,7 @@ set -gx FORKS_FOLDER $GITHUB_FOLDER/forks
 set -gx PYTHON_FOLDER $ENV_FOLDER/python
 set -gx PYTHON_LIB_FOLDER $PYTHON_FOLDER/lib
 set -gx PYTHON_SCRIPTS_FOLDER $PYTHON_FOLDER/scripts
+set -gx PYTHON_SETUP_FOLDER $PYTHON_FOLDER/setup
 
 set -gx TMP_BUILD_FOLDER $TMP_FOLDER/build
 

diff --git a/fish/functions/add_hetzner_mirror_to_repos.fish b/fish/functions/add_hetzner_mirror_to_repos.fish
@@ -18,7 +18,7 @@ if orig_pacman_conf_txt != new_pacman_conf_txt:
     pacman_conf.write_text(new_pacman_conf_txt, encoding='utf-8')"
 
     if test (count $argv) -eq 0
-        sudo env PYTHONPATH=$PYTHON_FOLDER/setup python -c "$program"
+        sudo env PYTHONPATH=$PYTHON_SETUP_FOLDER python -c "$program"
         return
     end
 
@@ -28,7 +28,7 @@ if orig_pacman_conf_txt != new_pacman_conf_txt:
                 printf '\n%s\n%s\n%s%s%s\n%s\n' \
                     '# Import Hetzner mirror from the host configuration if using pacman' \
                     'if command -v python3 >/dev/null 2>&1; then' \
-                    '    PYTHONPATH=/run/host'$PYTHON_FOLDER'/setup python3 -c "' \
+                    '    PYTHONPATH=/run/host'$PYTHON_SETUP_FOLDER' python3 -c "' \
                     "$program" \
                     '" || exit' \
                     fi

diff --git a/fish/functions/is_hetzner.fish b/fish/functions/is_hetzner.fish
@@ -6,5 +6,5 @@ function is_hetzner -d "Checks if current running machine is a Hetzner machine"
     if test $LOCATION = hetzner # duh
         return 0
     end
-    PYTHONPATH=$PYTHON_FOLDER/setup python3 -c 'from arch import is_hetzner; import sys; sys.exit(0 if is_hetzner() else 1)'
+    PYTHONPATH=$PYTHON_SETUP_FOLDER python3 -c 'from arch import is_hetzner; import sys; sys.exit(0 if is_hetzner() else 1)'
 end