h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-09 12:11:20 -03:00
Code Issues Packages Projects Releases Wiki Activity

Make completion of subsommands for time and sudo a bit better at differing between command and subcommand

Browse Source 
darcs-hash:20060202153151-ac50b-d943052af165dc345366b49a5db413f635a2f28a.gz
This commit is contained in:
axel
2006-02-03 01:31:51 +10:00
parent ff03fe7e41
commit fbe66f54aa
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
init/completions/sudo.fish
View File

@@ -4,5 +4,5 @@
complete -c sudo -d (_ "Command to run") -x -a "(__fish_complete_subcommand)" complete -c sudo -d (_ "Command to run") -x -a "(__fish_complete_subcommand)"
complete -c sudo -s h -d (_ "Display help and exit") complete -c sudo -s h -n "__fish_no_arguments" -d (_ "Display help and exit")
complete -c sudo -s v -d (_ "Validate") complete -c sudo -s v -n "__fish_no_arguments" -d (_ "Validate")

14
init/completions/time.fish
View File

@@ -1,11 +1,11 @@
complete -c time -a "(__fish_complete_subcommand -- -o --output -f --format)" -d (_ "Command") complete -c time -a "(__fish_complete_subcommand -- -o --output -f --format)" -d (_ "Command")
complete -c time -s f -l format -d (_ "Specify output format") -x complete -c time -s f -l format -n "__fish_no_arguments" -d (_ "Specify output format") -x
complete -c time -s p -l portable -d (_ "Use the portable output format") complete -c time -s p -l portable -n "__fish_no_arguments" -d (_ "Use the portable output format")
complete -c time -s o -l output -d (_ "Do not send the results to stderr, but overwrite the specified file") -r complete -c time -s o -l output -n "__fish_no_arguments" -d (_ "Do not send the results to stderr, but overwrite the specified file") -r
complete -c time -s a -l append -d (_ "(Used together with -o) Do not overwrite but append") complete -c time -s a -l append -n "__fish_no_arguments" -d (_ "(Used together with -o) Do not overwrite but append")
complete -c time -s v -l verbose -d (_ "Verbose mode") complete -c time -s v -l verbose -n "__fish_no_arguments" -d (_ "Verbose mode")
complete -c time -l help -d (_ "Display help and exit") complete -c time -l help -n "__fish_no_arguments" -d (_ "Display help and exit")
complete -c time -s V -l version -d (_ "Display version and exit") complete -c time -s V -l version -n "__fish_no_arguments" -d (_ "Display version and exit")

16
init/fish_complete.fish.in
View File

@@ -116,7 +116,7 @@ function __fish_complete_subcommand -d "Complete subcommand"
set res "$res $i" set res "$res $i"
else else
if contains $i $argv if contains -- $i $argv
set skip_next 1 set skip_next 1
continue continue
end end
@@ -331,6 +331,20 @@ function __fish_is_first_token -d 'Test if no non-switch argument has been speci
return 0 return 0
end end
function __fish_no_arguments -d "Internal fish function"
set -l cmd (commandline -poc) (commandline -tc)
set -e cmd[1]
for i in $cmd
switch $i
case '-*'
case '*'
return 1
end
end
return 0
end
# #
# Completions for SysV startup scripts # Completions for SysV startup scripts
# #