diff options
Diffstat (limited to 'test/tests')
-rw-r--r-- | test/tests/find-python-executable.bash | 8 | ||||
-rw-r--r-- | test/tests/shim.bash | 9 |
2 files changed, 4 insertions, 13 deletions
diff --git a/test/tests/find-python-executable.bash b/test/tests/find-python-executable.bash index 9a91a74..561b882 100644 --- a/test/tests/find-python-executable.bash +++ b/test/tests/find-python-executable.bash @@ -1,18 +1,16 @@ test_description='can find python executable with different names' . '../test-lib.bash' -if ${USE_VAGRANT}; then - DOTBOT_EXEC="/dotbot/bin/dotbot" # revert to calling it as a shell script -fi - # the test machine needs to have a binary named `python` test_expect_success 'setup' ' mkdir ~/tmp_bin && ( IFS=: for p in $PATH; do - find $p -maxdepth 1 -mindepth 1 -exec sh -c \ + if [ -d $p ]; then + find $p -maxdepth 1 -mindepth 1 -exec sh -c \ '"'"'ln -sf {} $HOME/tmp_bin/$(basename {})'"'"' \; + fi done ) && rm -f ~/tmp_bin/python && diff --git a/test/tests/shim.bash b/test/tests/shim.bash index 2ed7d54..ddacae3 100644 --- a/test/tests/shim.bash +++ b/test/tests/shim.bash @@ -4,11 +4,7 @@ test_description='install shim works' test_expect_success 'setup' ' cd ${DOTFILES} git init -if ${USE_VAGRANT}; then - git submodule add /dotbot dotbot -else - git submodule add ${BASEDIR} dotbot -fi +git submodule add ${BASEDIR} dotbot cp ./dotbot/tools/git-submodule/install . echo "pear" > ${DOTFILES}/foo ' @@ -18,9 +14,6 @@ cat > ${DOTFILES}/install.conf.yaml <<EOF - link: ~/.foo: foo EOF -if ! ${USE_VAGRANT}; then - sed -i "" "1 s/sh$/python/" ${DOTFILES}/dotbot/bin/dotbot -fi ${DOTFILES}/install ' |