wrapFish: fix singleton expansion in shell init #113232
Merged
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
This fixes the expansion of the configuration path in the pathological case of a singleton, which would otherwise be used verbatim with the surrounding braces for lookup. GitHub: see NixOS#108491 (review)
|
CC @teehemkay |
teehemkay
reviewed
Feb 16, 2021
|
|
||
| in writeShellScriptBin "fish" '' | ||
| ${fish}/bin/fish --init-command " | ||
| set --prepend fish_complete_path ${escapeShellArgs complPath} | ||
| set --prepend fish_function_path ${escapeShellArgs funcPath} | ||
| for c in {${concatStringsSep "," safeConfPath}}/*; source $c; end | ||
| set --local fish_conf_source_path ${escapeShellArgs confPath} | ||
| for c in $fish_conf_source_path/*; source $c; end |
There was a problem hiding this comment.
@pacien I may be missing something obvious, but isn't this going to break in the case where confPath is not a singleton?
There was a problem hiding this comment.
Please ignore my previous comment and thank you for helping me better understand fish cartesian products.
There was a problem hiding this comment.
I had the same question and had to run it myself to totally understand:
$ mkdir a b c d e
$ touch a/1 b/2 c/3 d/4 e/5
$ set --local test a b c d e
$ for c in $test/*; echo $c; end
a/1
b/2
c/3
d/4
e/5
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.
This fixes the expansion of the configuration path in the pathological
case of a singleton, which would otherwise be used verbatim with the
surrounding braces for lookup.
GitHub: see #108491 (review)
Motivation for this change
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)