nix-shell: support single quotes in shebangs, fix whitespace parsing #8470
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
with-tests
ncfavier
force-pushed
the
shebang-single-quotes
branch
2 times, most recently
from
c59460e to
ac7e219
Compare
|
I spotted another issue with the whitespace: I might as well fix that too. |
ncfavier
force-pushed
the
shebang-single-quotes
branch
from
ac7e219 to
dd8ac26
Compare
|
Should be good now. |
ncfavier
changed the title
3 tasks
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/2023-06-09-nix-team-meeting-minutes-61/29163/1 |
roberth
reviewed
Jun 16, 2023
tests/shell.shebang.sh
Outdated
| @@ -1,4 +1,4 @@ | |||
| #! @ENV_PROG@ nix-shell | |||
| #! nix-shell -I nixpkgs=shell.nix --no-substitute | |||
| #! nix-shell --pure -i bash -p foo bar | |||
| #! nix-shell --pure -i bash -p '(_: foo) "absurd"' "b\ar" | |||
There was a problem hiding this comment.
This test does not prove enough, because this works:
nix-repl> with { foo = true; }; (_: foo) absurd
true
What we need to see is that the parsed values are correct, including
"in''in"- escaping
- concatenation, for example is this a valid way to handle a single quote in a single-quoted string?
does'It'"'"'s one string'parse as a single string containingIt's one string?
To test this effectively, I think it'd be best to find a way to echo a whole string and not just some variables. Maybe --argstr could be useful?
ncfavier
force-pushed
the
shebang-single-quotes
branch
2 times, most recently
from
406fa76 to
bf64b4b
Compare
|
Macos tests failing because of cachix/install-nix-action#183, need install-nix-action bump. Would be cool not to cancel the ubuntu tests on failure. |
8 tasks
ncfavier
force-pushed
the
shebang-single-quotes
branch
from
bf64b4b to
2978fc2
Compare
|
Does anything else need to be done here? |
|
I guess I can write a release note. |
ncfavier
force-pushed
the
shebang-single-quotes
branch
from
2978fc2 to
3cc763d
Compare
Single quotes are a basic feature of shell syntax that people expect to work. They are also more convenient for writing literal code expressions with less escaping.
Leading whitespace after `nix-shell` used to produce an empty argument, while an empty argument at the end of the line was ignored. Fix the first issue by consuming the initial whitespace before calling shellwords; fix the second issue by returning immediately if whitespace is found at the end of the string instead of checking for an empty string. Also throw if quotes aren't terminated.
roberth
force-pushed
the
shebang-single-quotes
branch
from
3cc763d to
5f8e057
Compare
roberth
approved these changes
Oct 23, 2023
roberth
force-pushed
the
shebang-single-quotes
branch
from
5f8e057 to
e053eeb
Compare
tebowy
pushed a commit
to tebowy/nix
that referenced
this pull request
Jul 11, 2024
nix-shell: support single quotes in shebangs, fix whitespace parsing (cherry picked from commit 3b99c62) Change-Id: I2a431b21c3467eefa1ef95d5a36d672f45b6937a
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and context
Fixes #2356
Checklist for maintainers
Maintainers: tick if completed or explain if not relevant
tests/**.shsrc/*/teststests/nixos/*Priorities
Add 👍 to pull requests you find important.