diff options
| author | Matt Martz <matt@sivel.net> | 2021-10-19 14:24:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-19 14:24:57 -0500 |
| commit | 66a83314b9d30c6a139de960e6da8d5554c28544 (patch) | |
| tree | 88b110f697b43addcbe82de8d1a824467130ac50 /hacking | |
| parent | 43d09710c81f36113fec8d68e650a6b6d82dca05 (diff) | |
| download | ansible-66a83314b9d30c6a139de960e6da8d5554c28544.tar.gz | |
Modernize install (#76021)
Co-authored-by: Matt Clay <matt@mystile.com>
Co-authored-by: Matt Davis <mrd@redhat.com>
Co-authored-by: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>
Diffstat (limited to 'hacking')
| -rw-r--r-- | hacking/env-setup | 2 | ||||
| -rw-r--r-- | hacking/env-setup.fish | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/hacking/env-setup b/hacking/env-setup index c9fbdbd55f..4741423b4d 100644 --- a/hacking/env-setup +++ b/hacking/env-setup @@ -48,10 +48,12 @@ FULL_PATH=$($PYTHON_BIN -c "import os; print(os.path.realpath('$HACKING_DIR'))") export ANSIBLE_HOME="$(dirname "$FULL_PATH")" PREFIX_PYTHONPATH="$ANSIBLE_HOME/lib" +ANSIBLE_TEST_PREFIX_PYTHONPATH="$ANSIBLE_HOME/test/lib" PREFIX_PATH="$ANSIBLE_HOME/bin" PREFIX_MANPATH="$ANSIBLE_HOME/docs/man" expr "$PYTHONPATH" : "${PREFIX_PYTHONPATH}.*" > /dev/null || prepend_path PYTHONPATH "$PREFIX_PYTHONPATH" +expr "$PYTHONPATH" : "${ANSIBLE_TEST_PREFIX_PYTHONPATH}.*" > /dev/null || prepend_path PYTHONPATH "$ANSIBLE_TEST_PREFIX_PYTHONPATH" expr "$PATH" : "${PREFIX_PATH}.*" > /dev/null || prepend_path PATH "$PREFIX_PATH" expr "$MANPATH" : "${PREFIX_MANPATH}.*" > /dev/null || prepend_path MANPATH "$PREFIX_MANPATH" diff --git a/hacking/env-setup.fish b/hacking/env-setup.fish index 94126cad40..944c029ff9 100644 --- a/hacking/env-setup.fish +++ b/hacking/env-setup.fish @@ -5,6 +5,7 @@ set HACKING_DIR (dirname (status -f)) set FULL_PATH (python -c "import os; print(os.path.realpath('$HACKING_DIR'))") set ANSIBLE_HOME (dirname $FULL_PATH) set PREFIX_PYTHONPATH $ANSIBLE_HOME/lib +set ANSIBLE_TEST_PREFIX_PYTHONPATH $ANSIBLE_HOME/test/lib set PREFIX_PATH $ANSIBLE_HOME/bin set PREFIX_MANPATH $ANSIBLE_HOME/docs/man @@ -31,6 +32,16 @@ else end end +# Set ansible_test PYTHONPATH +switch PYTHONPATH + case "$ANSIBLE_TEST_PREFIX_PYTHONPATH*" + case "*" + if not [ $QUIET ] + echo "Appending PYTHONPATH" + end + set -gx PYTHONPATH "$ANSIBLE_TEST_PREFIX_PYTHONPATH:$PYTHONPATH" +end + # Set PATH if not contains $PREFIX_PATH $PATH set -gx PATH $PREFIX_PATH $PATH |