convert nextd to use argparse

This commit is contained in:
Kurtis Rader 2017-07-09 16:26:11 -07:00
parent 5cf2a50269
commit abef2cc422

View file

@ -1,45 +1,33 @@
function nextd --description "Move forward in the directory history" function nextd --description "Move forward in the directory history"
set -l options 'h/help' 'l/list'
argparse $options -- $argv
or return
if count $argv >/dev/null if set -q _flag_help
switch $argv[1]
case -h --h --he --hel --help
__fish_print_help nextd __fish_print_help nextd
return 0 return 0
end end
if set -q argv[2]
printf (_ "%s: Too many arguments") nextd >&2
return 1
end end
# Parse arguments
set -l show_hist 0
set -l times 1 set -l times 1
if count $argv >/dev/null if set -q $argv[1]
for i in (seq (count $argv)) if test $argv[1] -ge 0 ^/dev/null
switch $argv[$i] set times $argv[1]
case '-l' --l --li --lis --list
set show_hist 1
continue
case '-*'
printf (_ "%s: Unknown option %s\n" ) nextd $argv[$i]
return 1
case '*'
if test $argv[$i] -ge 0 ^/dev/null
set times $argv[$i]
else else
printf (_ "%s: The number of positions to skip must be a non-negative integer\n" ) nextd printf (_ "%s: The number of positions to skip must be a non-negative integer\n") nextd
return 1 return 1
end end
continue
end
end
end end
# Traverse history # Traverse history
set -l code 1 set -l code 1
if count $times >/dev/null
for i in (seq $times) for i in (seq $times)
# Try one step backward # Try one step backward
if __fish_move_last dirnext dirprev if __fish_move_last dirnext dirprev
# We consider it a success if we were able to do at least 1 step # We consider it a success if we were able to do at least 1 step
# (low expectations are the key to happiness ;) # (low expectations are the key to happiness ;)
set code 0 set code 0
@ -47,18 +35,15 @@ function nextd --description "Move forward in the directory history"
break break
end end
end end
end
# Show history if needed # Show history if needed
if test $show_hist = 1 if set -q _flag_list
dirh dirh
end end
# Set direction for 'cd -' # Set direction for 'cd -'
if test $code = 0 ^/dev/null test $code = 0
set -g __fish_cd_direction prev and set -g __fish_cd_direction prev
end
# All done
return $code return $code
end end