Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 04:43:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed kill-signals completion. Added completions for OS X kill command.

Browse source 
Don't generate killall completions when running on Solaris OS - `killall` there literally kills all processes.
This commit is contained in:
lordlycastle 2015-12-17 02:37:01 +01:00 committed by Fabian Homborg
parent 994aba075d
commit f23c2beb61
3 changed files with 65 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
share/completions/kill.fish
View file

@ -4,10 +4,21 @@ for i in $__kill_signals
set number (echo $i | cut -d " " -f 1) set number (echo $i | cut -d " " -f 1)
set name (echo $i | cut -d " " -f 2) set name (echo $i | cut -d " " -f 2)
complete -c kill -o $number -d $name complete -c kill -o $number -d $name
complete -c kill -o $name -d $name complete -c kill -o $name
complete -c kill -o s -x -a \"$number\tSend\ $name\ signal\" complete -c kill -s s -x -a "$number $name"
complete -c kill -o s -x -a \"$name\tSend\ $name\ signal\"
end end
complete -c kill -xa '(__fish_complete_pids)' complete -c kill -xa '(__fish_complete_pids)'
if kill -L > /dev/null ^ /dev/null
complete -c kill -s s -l signal -d "Signal to send"
complete -c kill -s l -l list -d "Printf list of signal names, or name of given SIG NUMBER"
complete -c kill -s L -l table -d " Print signal names and their corresponding numbers"
complete -c kill -s a -l all -d "Do not restrict the commandname-to-pid conversion to processes with the same uid as the present process"
complete -c kill -s p -l pid -d "Only print pid of the named processes, do not send any signals"
complete -c kill -s q -l queue -d "Use sigqueue(2) rather than kill(2). The value argument is an integer that is sent along with the signal."
complete -c kill -l verbos -d "Print pid(s) that will be signaled with kill along with the signal."
else # OS X
complete -c kill -s s -d "Signal to send"
complete -c kill -s l -d "Printf list of signal names, or name of given SIG NUMBER"
end

62
share/completions/killall.fish
View file

@ -1,20 +1,52 @@
__fish_make_completion_signals # For Solaris OS, we don't need to generate completions. Since it can hang the PC.
if test (uname) != 'SunOS'
__fish_make_completion_signals
for i in $__kill_signals for i in $__kill_signals
set number (echo $i | cut -d " " -f 1) set number (echo $i | cut -d " " -f 1)
set name (echo $i | cut -d " " -f 2) set name (echo $i | cut -d " " -f 2)
complete -c killall -o $number -d $name complete -c killall -o $number -d $name
complete -c killall -o $name -d $name complete -c killall -o $name
complete -c killall -o s -x -a \"$number\tSend\ $name\ signal\" # Doesn't work in OS X; -s is simulate
complete -c killall -o s -x -a \"$name\tSend\ $name\ signal\" test (uname) != 'Darwin'; and complete -c killall -s s -x -a "$number $name"
end
# Finds and completes all users, and their respective UID.
function __make_users_completions
set -l users (dscl . list /Users | grep -v '^_.*')
for user in $users
set -l uid (id -u $user)
# GNU doesn't support UID
killall --version > /dev/null ^ /dev/null; and set -el uid
complete -c killall -s u -x -a "$user $uid" -d "Match only processes belonging to $user"
end
end
complete -c killall -xa '(__fish_complete_proc)'
if killall --version > /dev/null ^ /dev/null
complete -c killall -s e -l exact -d 'Require an exact match for very long names'
complete -c killall -s I -l ignore-case -d 'Do case insensitive process name match'
complete -c killall -s g -l process-group -d 'Kill the process group to which the process belongs. The kill signal is only sent once per group, even if multiple processes belonging to the same process group were found'
complete -c killall -s i -l interactive -d 'Interactively ask for confirmation before killing'
complete -c killall -s u -l user -d 'Kill only processes the specified user owns. Command names are optional' -x
__make_users_completions
complete -c killall -s w -l wait -d 'Wait for all killed processes to die. killall checks once per second if any of the killed processes still exist and only returns if none are left. Note that killall may wait forever if the signal was ignored, had no effect, or if the process stays in zombie state'
complete -c killall -s v -l version -d 'Print version'
else
complete -c killall -s v -d 'Be more verbose about what will be done'
complete -c killall -s e -d 'Use effective user ID instead of the real user ID for matching processes specified with the -u option'
complete -c killall -s help -d 'Print help and exit'
complete -c killall -s l -d 'List names of available signals and exit'
complete -c killall -s m -d 'Case sensitive argument match for processed'
complete -c killall -s s -d 'Simulate, but do not send any signals'
complete -c killall -s d -d 'Print detailed info. Doesn\'t send signals'
complete -c killall -s u -x -d 'Only processes for USER'
# Completions for users
__make_users_completions
complete -c killall -s t -d 'Limit to processes running on specified TTY'
complete -c killall -s t -xa "(ps a -o tty | sed 1d | uniq)"
complete -c killall -s c -x -d 'Limit to processes matching specified PROCNAME'
complete -c killall -s z -d 'Do not skip zombies'
end
end end
complete -c killall -xa '(__fish_complete_proc)'
complete -c killall -s e -l exact -d 'Require an exact match for very long names'
complete -c killall -s I -l ignore-case -d 'Do case insensitive process name match'
complete -c killall -s g -l process-group -d 'Kill the process group to which the process belongs. The kill signal is only sent once per group, even if multiple processes belonging to the same process group were found'
complete -c killall -s i -l interactive -d 'Interactively ask for confirmation before killing'
complete -c killall -s u -l user -d 'Kill only processes the specified user owns. Command names are optional'
complete -c killall -s w -l wait -d 'Wait for all killed processes to die. killall checks once per second if any of the killed processes still exist and only returns if none are left. Note that killall may wait forever if the signal was ignored, had no effect, or if the process stays in zombie state'

2
share/functions/__fish_make_completion_signals.fish
View file

@ -11,7 +11,7 @@ function __fish_make_completion_signals --description 'Make list of kill signals
# SIGNUM', so we use this instead. # SIGNUM', so we use this instead.
complete -c kill -s l --description "List names of available signals" complete -c kill -s l --description "List names of available signals"
for i in (seq 31) for i in (seq 31)
set -g __kill_signals $signals $i" "(kill -l $i) set -g __kill_signals $__kill_signals $i" "(kill -l $i)
end end
end end
end end