starred/ansible
1
0
Fork 0
mirror of https://github.com/ansible/ansible.git synced 2026-08-02 00:22:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update hacking env_setup to prefer Python 3 (#75213)

Browse Source 
* env_setup - Prefer Python3

Prefer the 'python3' executable over 'python'.

* Add shebang for syntax detection

While the script isn't executable and we recommend sourcing it, having a shebang allows
variuos text editors to detect that it is a shell script and apply proper syntax highlighting.
This commit is contained in:
Sam Doran
2021-07-08 15:14:34 -04:00
committed by GitHub
parent 3ba2243ba3
commit 93e72c96f0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hacking/env-setup
+2 -2
View File
@@ -1,4 +1,4 @@
#!/bin/sh
# usage: source hacking/env-setup [-q] # usage: source hacking/env-setup [-q]
# modifies environment for running Ansible from checkout # modifies environment for running Ansible from checkout
@@ -22,7 +22,7 @@ prepend_path()
PYTHONPATH=${PYTHONPATH-""} PYTHONPATH=${PYTHONPATH-""}
PATH=${PATH-""} PATH=${PATH-""}
MANPATH=${MANPATH-$(manpath)} MANPATH=${MANPATH-$(manpath)}
PYTHON=$(command -v python || command -v python3) PYTHON=$(command -v python3 || command -v python)
PYTHON_BIN=${PYTHON_BIN-$PYTHON} PYTHON_BIN=${PYTHON_BIN-$PYTHON}
verbosity=${1-info} # Defaults to `info' if unspecified verbosity=${1-info} # Defaults to `info' if unspecified
hacking/env-setup.fish
+3 -3
View File
@@ -47,10 +47,10 @@ end
# Set PYTHON_BIN # Set PYTHON_BIN
if not set -q PYTHON_BIN if not set -q PYTHON_BIN
if test (which python) if test (which python3)
set -gx PYTHON_BIN (which python)
else if test (which python3)
set -gx PYTHON_BIN (which python3) set -gx PYTHON_BIN (which python3)
else if test (which python)
set -gx PYTHON_BIN (which python)
else else
echo "No valid Python found" echo "No valid Python found"
exit 1 exit 1