Skip to content

fix(command-not-found): support use-xdg-base-directories #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ryanccn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(command-not-found): support use-xdg-base-directories #290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions command-not-found.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ command_not_found_handle () {
The program '$cmd' is currently not installed. It is provided by
the package '$toplevel.$attrs', which I will now install for you.
EOF
if [ -e "$HOME/.nix-profile/manifest.json" ]; then
nix profile install $toplevel#$attrs
if [ -e "${XDG_STATE_HOME-$HOME/.local/state}/nix/profile" ] || [ -e "$HOME/.nix-profile/manifest.json" ]; then
nix profile add $toplevel#$attrs
else
nix-env -iA $toplevel.$attrs
fi
Expand All @@ -71,11 +71,11 @@ $cmd: command not found
EOF
fi
else
if [ -e "$HOME/.nix-profile/manifest.json" ]; then
if [ -e "${XDG_STATE_HOME-$HOME/.local/state}/nix/profile" ] || [ -e "$HOME/.nix-profile/manifest.json" ]; then
>&2 cat <<EOF
The program '$cmd' is currently not installed. You can install it
by typing:
nix profile install $toplevel#$attrs
nix profile add $toplevel#$attrs

Or run it once with:
nix shell $toplevel#$attrs -c $cmd ...
Expand All @@ -101,8 +101,8 @@ EOF
# ensure we get each element of attrs
# in a cross platform way
while read attr; do
if [ -e "$HOME/.nix-profile/manifest.json" ]; then
>&2 echo " nix profile install $toplevel#$attr"
if [ -e "${XDG_STATE_HOME-$HOME/.local/state}/nix/profile" ] || [ -e "$HOME/.nix-profile/manifest.json" ]; then
>&2 echo " nix profile add $toplevel#$attr"
else
>&2 echo " nix-env -iA $toplevel.$attr"
fi
Expand All @@ -114,7 +114,7 @@ Or run it once with:
EOF

while read attr; do
if [ -e "$HOME/.nix-profile/manifest.json" ]; then
if [ -e "${XDG_STATE_HOME-$HOME/.local/state}/nix/profile" ] || [ -e "$HOME/.nix-profile/manifest.json" ]; then
>&2 echo " nix shell $toplevel#$attr -c $cmd ..."
else
>&2 echo " nix-shell -p $attr --run '$cmd ...'"
Expand Down