3
0
Fork 0
forked from mirrors/nixpkgs

nixos/command-not-found: don't use fancy quotes

This commit is contained in:
Bernardo Meurer 2021-01-01 20:04:28 -08:00
parent 88632b7801
commit e4cd9a8f04
No known key found for this signature in database
GPG key ID: F4C0D53B8D14C246

View file

@ -27,8 +27,8 @@ if (!defined $res || scalar @$res == 0) {
my $package = @$res[0]->{package}; my $package = @$res[0]->{package};
if ($ENV{"NIX_AUTO_INSTALL"} // "") { if ($ENV{"NIX_AUTO_INSTALL"} // "") {
print STDERR <<EOF; print STDERR <<EOF;
The program $program is currently not installed. It is provided by The program '$program' is currently not installed. It is provided by
the package $package, which I will now install for you. the package '$package', which I will now install for you.
EOF EOF
; ;
exit 126 if system("nix-env", "-iA", "nixos.$package") == 0; exit 126 if system("nix-env", "-iA", "nixos.$package") == 0;
@ -36,14 +36,14 @@ EOF
exec("nix-shell", "-p", $package, "--run", shell_quote("exec", @ARGV)); exec("nix-shell", "-p", $package, "--run", shell_quote("exec", @ARGV));
} else { } else {
print STDERR <<EOF; print STDERR <<EOF;
The program $program is not in your PATH. You can make it available in a The program '$program' is not in your PATH. You can make it available in a
ephemeral shell by typing: ephemeral shell by typing:
nix-shell -p $package nix-shell -p $package
EOF EOF
} }
} else { } else {
print STDERR <<EOF; print STDERR <<EOF;
The program $program is not in your PATH. It is provided by several packages. The program '$program' is not in your PATH. It is provided by several packages.
You can make it available in a ephemeral shell by typing one of the following: You can make it available in a ephemeral shell by typing one of the following:
EOF EOF
print STDERR " nix-shell -p $_->{package}\n" foreach @$res; print STDERR " nix-shell -p $_->{package}\n" foreach @$res;