diff --git a/src/parallel b/src/parallel index 5b16b0e4..0ca28538 100755 --- a/src/parallel +++ b/src/parallel @@ -953,7 +953,7 @@ sub parse_options { sub init_globals { # Defaults: - $Global::version = 20150109; + $Global::version = 20150115; $Global::progname = 'parallel'; $Global::infinity = 2**31; $Global::debug = 0; diff --git a/testsuite/tests-to-run/parallel-local23.sh b/testsuite/tests-to-run/parallel-local23.sh index 47dea6cc..a84de819 100755 --- a/testsuite/tests-to-run/parallel-local23.sh +++ b/testsuite/tests-to-run/parallel-local23.sh @@ -65,6 +65,10 @@ echo '### --header num --round-robin' echo '### shebang-wrap' $NICEPAR -k {} {} A B C ::: ./input-files/shebang/shebangwrap.*[^~] +echo 'bug #43967: Error if there exists a bin/zsh or bin/bash dir (with zsh or bash).' + mkdir -p /tmp/bash$$/bash; PATH=/tmp/bash$$:$PATH parallel echo ::: OK; rm -rf /tmp/bash$$ + + EOF rm -rf tmp diff --git a/testsuite/wanted-results/parallel-local23 b/testsuite/wanted-results/parallel-local23 index 1278ef02..04052b32 100644 --- a/testsuite/wanted-results/parallel-local23 +++ b/testsuite/wanted-results/parallel-local23 @@ -179,3 +179,7 @@ C A B C +echo 'bug #43967: Error if there exists a bin/zsh or bin/bash dir (with zsh or bash).' +bug #43967: Error if there exists a bin/zsh or bin/bash dir (with zsh or bash). + mkdir -p /tmp/bash$$/bash; PATH=/tmp/bash$$:$PATH parallel echo ::: OK; rm -rf /tmp/bash$$ +OK