mirror of
https://github.com/fish-shell/fish-shell.git
synced 2025-01-19 20:52:48 +08:00
Squashed commit of the following:
commitd81ae2665f
Author: Max Gonzih <gonzih@gmail.com> Date: Sun Feb 2 16:22:18 2014 +0300 Check for command-not-found command on suse commit004b794c82
Author: Max Gonzih <gonzih@gmail.com> Date: Sun Feb 2 14:04:41 2014 +0300 Fix cnf handler for Suse and Fedora fixes #1208
This commit is contained in:
parent
a1b43b7a09
commit
27b6fe682d
|
@ -237,8 +237,20 @@ function __fish_config_interactive -d "Initializations that should be performed
|
|||
# Remove fish_command_not_found_setup so we only execute this once
|
||||
functions --erase __fish_command_not_found_setup
|
||||
|
||||
# First check in /usr/lib, this is where modern Ubuntus place this command
|
||||
if test -f /usr/lib/command-not-found
|
||||
# First check if we are on OpenSUSE since SUSE's handler has no options
|
||||
# and expects first argument to be a command and second database
|
||||
# also check if there is command-not-found command.
|
||||
if begin; test -f /etc/SuSE-release; and type -p command-not-found > /dev/null 2> /dev/null; end
|
||||
function __fish_command_not_found_handler --on-event fish_command_not_found
|
||||
/usr/bin/command-not-found $argv
|
||||
end
|
||||
# Check for Fedora's handler
|
||||
else if test -f /usr/libexec/pk-command-not-found
|
||||
function __fish_command_not_found_handler --on-event fish_command_not_found
|
||||
/usr/libexec/pk-command-not-found -- $argv
|
||||
end
|
||||
# Check in /usr/lib, this is where modern Ubuntus place this command
|
||||
else if test -f /usr/lib/command-not-found
|
||||
function __fish_command_not_found_handler --on-event fish_command_not_found
|
||||
/usr/lib/command-not-found -- $argv
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue
Block a user