Merge pull request #51 from etu/master

Fixed support for multiple -f that I broke, and made fish-completions support the new .pony-name-format
This commit is contained in:
Mattias Andrée 2012-07-21 03:58:43 -07:00
commit 232fd2461a
2 changed files with 3 additions and 3 deletions

View file

@ -13,11 +13,11 @@ end
if test -d $systempath if test -d $systempath
set -g systemponies (ls --color=no $systempath | sed 's/\.pony//') set -g systemponies (ls --color=no $systempath | sed -e 's/\.pony//' -e 's/_.*//' | perl -pe 's/([a-z])([A-Z])/\1\\\ \2/' )
end end
if test -d $homepath if test -d $homepath
set -g homeponies (ls --color=no $homepath | sed 's/\.pony//') set -g homeponies (ls --color=no $systempath | sed -e 's/\.pony//' -e 's/_.*//' | perl -pe 's/([a-z])([A-Z])/\1\\\ \2/' )
end end

View file

@ -270,7 +270,7 @@ while getopts $opts OPT; do
case ${OPT} in case ${OPT} in
v) version; exit ;; v) version; exit ;;
h) usage; exit ;; h) usage; exit ;;
f) ponies=($(echo $OPTARG | sed -e 's/ //g' -e 's/,/\n/')) ;; f) ponies+=($(echo $OPTARG | sed -e 's/ //g')) ;;
l) list; exit ;; l) list; exit ;;
L) linklist; exit ;; L) linklist; exit ;;
W) wrap="$OPTARG" ;; W) wrap="$OPTARG" ;;