Addressing #2027 gradually - use command -v
Currently only changed tests/test.sh and tests/test_bar/test.sh .
This commit is contained in:
parent
6569cc6cfd
commit
ef6c9b435c
|
@ -18,7 +18,7 @@ if test "$TRAVIS" = true ; then
|
|||
workon cpython-ucs2-$UCS2_PYTHON_VARIANT
|
||||
set -e
|
||||
else
|
||||
LIBRARY_PATH="$(ldd "$(which python)" | grep libpython | sed 's/^.* => //;s/ .*$//')"
|
||||
LIBRARY_PATH="$(ldd "$(command -v python)" | grep libpython | sed 's/^.* => //;s/ .*$//')"
|
||||
LIBRARY_DIR="$(dirname "${LIBRARY_PATH}")"
|
||||
export LD_LIBRARY_PATH="$LIBRARY_DIR${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
|
||||
fi
|
||||
|
|
|
@ -12,11 +12,11 @@ cp -r "$TEST_STATIC_ROOT/powerline" "$TEST_ROOT"
|
|||
|
||||
export PYTHONPATH="$ROOT${PYTHONPATH:+:}$PYTHONPATH"
|
||||
|
||||
ln -s "$(which "${PYTHON}")" "$TEST_PATH"/python
|
||||
ln -s "$(which sed)" "$TEST_PATH"
|
||||
ln -s "$(which cat)" "$TEST_PATH"
|
||||
ln -s "$(which mkdir)" "$TEST_PATH"
|
||||
ln -s "$(which basename)" "$TEST_PATH"
|
||||
ln -s "$(command -v "${PYTHON}")" "$TEST_PATH"/python
|
||||
ln -s "$(command -v sed)" "$TEST_PATH"
|
||||
ln -s "$(command -v cat)" "$TEST_PATH"
|
||||
ln -s "$(command -v mkdir)" "$TEST_PATH"
|
||||
ln -s "$(command -v basename)" "$TEST_PATH"
|
||||
ln -s "$TEST_PATH/lemonbar" "$TEST_PATH/bar-aint-recursive"
|
||||
|
||||
DEPRECATED_SCRIPT="$ROOT/powerline/bindings/bar/powerline-bar.py"
|
||||
|
|
Loading…
Reference in New Issue