From 49b22d4d6b87f81a7e028816469d626215b677a4 Mon Sep 17 00:00:00 2001
From: Daniel Gonçalves <dangoncalves@users.noreply.github.com>
Date: Tue, 5 Nov 2024 16:13:52 +0100
Subject: Python binary should not be python at first try for env-setup.fish
 (#84212)

---
 hacking/env-setup.fish | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/hacking/env-setup.fish b/hacking/env-setup.fish
index ee945ec145..fcb739bf0c 100644
--- a/hacking/env-setup.fish
+++ b/hacking/env-setup.fish
@@ -3,9 +3,23 @@
 # Description: Modifies the environment for running Ansible from a checkout
 # Usage: . ./hacking/env-setup [-q]
 
+# Set PYTHON_BIN
+if not set -q PYTHON_BIN
+    for exe in python3 python
+        if command -v $exe > /dev/null
+            set -gx PYTHON_BIN (command -v $exe)
+            break
+        end
+    end
+    if not set -q PYTHON_BIN
+        echo "No valid Python found"
+        exit 1
+    end
+end
+
 # Retrieve the path of the current directory where the script resides
 set HACKING_DIR (dirname (status -f))
-set FULL_PATH (python -c "import os; print(os.path.realpath('$HACKING_DIR'))")
+set FULL_PATH ($PYTHON_BIN -c "import os; print(os.path.realpath('$HACKING_DIR'))")
 set ANSIBLE_HOME (dirname $FULL_PATH)
 
 # Set quiet flag
@@ -50,20 +64,6 @@ else if not string match -qr $PREFIX_MANPATH'($|:)' $MANPATH
     set -gx MANPATH "$PREFIX_MANPATH:$MANPATH"
 end
 
-# Set PYTHON_BIN
-if not set -q PYTHON_BIN
-    for exe in python3 python
-        if command -v $exe > /dev/null
-            set -gx PYTHON_BIN (command -v $exe)
-            break
-        end
-    end
-    if not set -q PYTHON_BIN
-        echo "No valid Python found"
-        exit 1
-    end
-end
-
 pushd $ANSIBLE_HOME
 if test -n "$QUIET"
     # Remove any .pyc files found
-- 
cgit v1.2.3