Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-11-11 15:37:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make dirh, nextd, prevd work on OS X

Browse source
This commit is contained in:
ridiculousfish 2012-05-04 18:53:38 -07:00
parent 007c5bc9f0
commit fe7fa46d57
3 changed files with 64 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
share/functions/dirh.fish
View file

@ -27,7 +27,7 @@ function dirh --description "Print the current directory history (the back- and
set_color normal
# BSD seq 0 outputs '1 0' instead of nothing
if test (count $dirnext) -gt 0
if count $dirnext > /dev/null
for i in (seq (echo (count $dirnext)) -1 1)
echo -n -e $dirnext[$i]$separator
end

60
share/functions/nextd.fish
View file

@ -12,37 +12,41 @@ function nextd --description "Move forward in the directory history"
# Parse arguments
set -l show_hist 0
set -l times 1
for i in (seq (count $argv))
switch $argv[$i]
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
printf (_ "%s: The number of positions to skip must be a non-negative integer\n" ) nextd
return 1
end
continue
end
end
if count $argv > /dev/null
for i in (seq (count $argv))
switch $argv[$i]
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
printf (_ "%s: The number of positions to skip must be a non-negative integer\n" ) nextd
return 1
end
continue
end
end
end
# Traverse history
set -l code 1
for i in (seq $times)
# Try one step backward
if __fish_move_last dirnext dirprev;
# We consider it a success if we were able to do at least 1 step
# (low expectations are the key to happiness ;)
set code 0
else
break
end
end
if count $times > /dev/null
for i in (seq $times)
# Try one step backward
if __fish_move_last dirnext dirprev;
# We consider it a success if we were able to do at least 1 step
# (low expectations are the key to happiness ;)
set code 0
else
break
end
end
end
# Show history if needed
if test $show_hist = 1

59
share/functions/prevd.fish
View file

@ -12,37 +12,41 @@ function prevd --description "Move back in the directory history"
# Parse arguments
set -l show_hist 0
set -l times 1
for i in (seq (count $argv))
switch $argv[$i]
case '-l' --l --li --lis --list
set show_hist 1
continue
case '-*'
printf (_ "%s: Unknown option %s\n" ) prevd $argv[$i]
return 1
case '*'
if test $argv[$i] -ge 0 ^/dev/null
set times $argv[$i]
else
printf (_ "The number of positions to skip must be a non-negative integer\n")
return 1
end
continue
end
if count $argv > /dev/null
for i in (seq (count $argv))
switch $argv[$i]
case '-l' --l --li --lis --list
set show_hist 1
continue
case '-*'
printf (_ "%s: Unknown option %s\n" ) prevd $argv[$i]
return 1
case '*'
if test $argv[$i] -ge 0 ^/dev/null
set times $argv[$i]
else
printf (_ "The number of positions to skip must be a non-negative integer\n")
return 1
end
continue
end
end
end
# Traverse history
set -l code 1
for i in (seq $times)
# Try one step backward
if __fish_move_last dirprev dirnext;
# We consider it a success if we were able to do at least 1 step
# (low expectations are the key to happiness ;)
set code 0
else
break
end
end
if count $times > /dev/null
for i in (seq $times)
# Try one step backward
if __fish_move_last dirprev dirnext;
# We consider it a success if we were able to do at least 1 step
# (low expectations are the key to happiness ;)
set code 0
else
break
end
end
end
# Show history if needed
if test $show_hist = 1
@ -57,4 +61,3 @@ function prevd --description "Move back in the directory history"
# All done
return $code
end