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

Fix various uses of old set syntax

Browse source 
darcs-hash:20060206184145-ac50b-5140cacddec9da734d4ef9a38f053259ea1f479a.gz
This commit is contained in:
axel 2006-02-07 04:41:45 +10:00
parent 08251dcc98
commit c4dfdfa849
1 changed files with 43 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
init/fish_function.fish
View file

@ -92,7 +92,7 @@ function help -d "Show help for the fish shell"
# If we are in a graphical environment, check if there is a graphical # If we are in a graphical environment, check if there is a graphical
# browser to use instead. # browser to use instead.
if test (echo $DISPLAY) -a \( "$XAUTHORITY" = "$HOME/.Xauthority" -o "$XAUTHORITY" = "" \) if test "$DISPLAY" -a \( "$XAUTHORITY" = "$HOME/.Xauthority" -o "$XAUTHORITY" = "" \)
for i in $graphical_browsers for i in $graphical_browsers
if which $i 2>/dev/null >/dev/null if which $i 2>/dev/null >/dev/null
set fish_browser $i set fish_browser $i
@ -544,10 +544,9 @@ function trap -d 'Perform an action when the shell recives a signal'
set -l shortopt set -l shortopt
set -l longopt set -l longopt
set shortopt -o lph set -l shortopt -o lph
if getopt -T >/dev/null set -l longopt
set longopt if not getopt -T >/dev/null
else
set longopt -l print,help,list-signals set longopt -l print,help,list-signals
end end
@ -656,26 +655,27 @@ end
function type -d "Print the type of a command" function type -d "Print the type of a command"
# Initialize # Initialize
set status 1 set -l status 1
set mode normal set -l mode normal
set selection all set -l selection all
#
# Get options # Get options
# #
set -- shortopt -o tpPafh set -l shortopt -o tpPafh
if getopt -T >/dev/null set -l longopt
set longopt if not getopt -T >/dev/null
else set longopt -l type,path,force-path,all,no-functions,help
set -- longopt -l type,path,force-path,all,no-functions,help
end end
if not getopt -n type -Q $shortopt $longopt -- $argv if not getopt -n type -Q $shortopt $longopt -- $argv
return 1 return 1
end end
set -- tmp (getopt $shortopt $longopt -- $argv) set -l tmp (getopt $shortopt $longopt -- $argv)
eval set -- opt $tmp set -l opt
eval set opt $tmp
for i in $opt for i in $opt
switch $i switch $i
@ -788,7 +788,7 @@ end
function __fish_umask_parse -d "Parses a file permission specification as into an octal version" function __fish_umask_parse -d "Parses a file permission specification as into an octal version"
# Test if already a valid octal mask, and pad it with zeros # Test if already a valid octal mask, and pad it with zeros
if echo $argv | grep -E '^(0|)[0-7]{1,3}$' >/dev/null if echo $argv | grep -E '^(0|)[0-7]{1,3}$' >/dev/null
for i in (seq (echo 5-(echo $argv|wc -c)|bc)); set -- argv 0$argv; end for i in (seq (echo 5-(echo $argv|wc -c)|bc)); set argv 0$argv; end
echo $argv echo $argv
else else
# Test if argument really is a valid symbolic mask # Test if argument really is a valid symbolic mask
@ -797,34 +797,38 @@ function __fish_umask_parse -d "Parses a file permission specification as into a
return 1 return 1
end end
set -e implicit_all set -l implicit_all
# Insert inverted umask into res variable # Insert inverted umask into res variable
set tmp $umask set -l mode
set -l val
set -l tmp $umask
set -l res
for i in 1 2 3 for i in 1 2 3
set -- tmp (echo $tmp|cut -c 2-) set tmp (echo $tmp|cut -c 2-)
set -- res[$i] (echo 7-(echo $tmp|cut -c 1)|bc) set res[$i] (echo 7-(echo $tmp|cut -c 1)|bc)
end end
set -- el (echo $argv|tr , \n) set -l el (echo $argv|tr , \n)
for i in $el for i in $el
switch $i switch $i
case 'u*' case 'u*'
set idx 1 set idx 1
set -- i (echo $i| cut -c 2-) set i (echo $i| cut -c 2-)
case 'g*' case 'g*'
set idx 2 set idx 2
set -- i (echo $i| cut -c 2-) set i (echo $i| cut -c 2-)
case 'o*' case 'o*'
set idx 3 set idx 3
set -- i (echo $i| cut -c 2-) set i (echo $i| cut -c 2-)
case 'a*' case 'a*'
set idx 1 2 3 set idx 1 2 3
set -- i (echo $i| cut -c 2-) set i (echo $i| cut -c 2-)
case '*' case '*'
set implicit_all 1 set implicit_all 1
@ -834,26 +838,26 @@ function __fish_umask_parse -d "Parses a file permission specification as into a
switch $i switch $i
case '=*' case '=*'
set mode set set mode set
set -- i (echo $i| cut -c 2-) set i (echo $i| cut -c 2-)
case '+*' case '+*'
set mode add set mode add
set -- i (echo $i| cut -c 2-) set i (echo $i| cut -c 2-)
case '-*' case '-*'
set mode remove set mode remove
set -- i (echo $i| cut -c 2-) set i (echo $i| cut -c 2-)
case '*' case '*'
if not set -q implicit_all if not count $implicit_all >/dev/null
echo umask: Invalid mask $argv >&2 printf (_ "%s: Invalid mask %s\n") umask $argv >&2
return return
end end
set mode set set mode set
end end
if not echo $perm|grep -E '^(r|w|x)*$' >/dev/null if not echo $perm|grep -E '^(r|w|x)*$' >/dev/null
echo umask: Invalid mask $argv >&2 printf (_ "%s: Invalid mask %s\n") umask $argv >&2
return return
end end
@ -919,20 +923,19 @@ function umask -d "Set default file permission mask"
set -l as_command 0 set -l as_command 0
set -l symbolic 0 set -l symbolic 0
set -- shortopt -o pSh set -l shortopt -o pSh
if getopt -T >/dev/null set -l longopt
set longopt if not getopt -T >/dev/null
else set longopt -l as-command,symbolic,help
set -- longopt -l as-command,symbolic,help
end end
if not getopt -n umask -Q $shortopt $longopt -- $argv if not getopt -n umask -Q $shortopt $longopt -- $argv
return 1 return 1
end end
set tmp -- (getopt $shortopt $longopt -- $argv) set -l tmp (getopt $shortopt $longopt -- $argv)
eval set -- opt $tmp eval set opt $tmp
while count $opt >/dev/null while count $opt >/dev/null
@ -977,7 +980,9 @@ function umask -d "Set default file permission mask"
set -l parsed (__fish_umask_parse $opt) set -l parsed (__fish_umask_parse $opt)
if test (count $parsed) -eq 1 if test (count $parsed) -eq 1
set -g umask $parsed set -g umask $parsed
return 0
end end
return 1
case '*' case '*'
printf (_ '%s: Too many arguments\n') umask >&2 printf (_ '%s: Too many arguments\n') umask >&2