diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2017-01-03T10·40+0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2017-01-03T10·40+0100 |
commit | c287e797a889202b1d603be4b445b961c37fb9b5 (patch) | |
tree | 15866d304dc23c38018c0c21d14fde8a9d91b55f /tests | |
parent | ae1e4dfad29e24739c7f280b1a96e16ba1b54d3a (diff) |
nix-shell: In #! mode, pass the last argument
"i < argc - 1" should be "i < argc".
Diffstat (limited to 'tests')
-rw-r--r-- | tests/nix-shell.sh | 4 | ||||
-rwxr-xr-x | tests/shell.shebang.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/nix-shell.sh b/tests/nix-shell.sh index 12a0ecd03c13..26cc521bbcbf 100644 --- a/tests/nix-shell.sh +++ b/tests/nix-shell.sh @@ -17,5 +17,5 @@ output=$(NIX_PATH=nixpkgs=shell.nix nix-shell --pure -p foo bar --run 'echo "$(f sed -e "s|@ENV_PROG@|$(type -p env)|" shell.shebang.sh > $TEST_ROOT/shell.shebang.sh chmod a+rx $TEST_ROOT/shell.shebang.sh -output=$($TEST_ROOT/shell.shebang.sh) -[ "$output" = "foo bar" ] +output=$($TEST_ROOT/shell.shebang.sh abc def) +[ "$output" = "foo bar abc def" ] diff --git a/tests/shell.shebang.sh b/tests/shell.shebang.sh index 544e2821750f..3dadd591572d 100755 --- a/tests/shell.shebang.sh +++ b/tests/shell.shebang.sh @@ -1,4 +1,4 @@ #! @ENV_PROG@ nix-shell #! nix-shell -I nixpkgs=shell.nix --option use-binary-caches false #! nix-shell --pure -i bash -p foo bar -echo "$(foo) $(bar)" +echo "$(foo) $(bar) $@" |