github-mirror/oh-my-fish
2
0
Fork 0
mirror of https://github.com/oh-my-fish/oh-my-fish.git synced 2025-01-22 12:16:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #374 from bucaran/fix-getopts-help

Browse Source 
fix getopts: handle -h --help bug fish-shell#746
This commit is contained in:
Jorge Bucaran 2015-02-12 00:58:56 +09:00
commit 4688c4bceb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/getopts/getopts.fish
View File

@ -201,7 +201,7 @@ function getopts
case --\* # Skip!
case -\*
# Split each token into single characters with `.`
for char in (printf $token | cut -c2- | grep --only-matching .)
for char in (printf "%s" $token | cut -c2- | grep --only-matching .)
# Do not split short option characters if this option can
# take optional required arguments.
if [ -z "$suspend_break" ]
@ -269,7 +269,7 @@ function getopts
and set -l is_long_option
# Trim leading dashes and prepare to match with valid options.
set option (printf $option | sed 's/^-*//g')
set option (printf "%s" $option | sed 's/^-*//g')
for substring in $__getopts_optstr
# Split up by token separator `:`. The resulting list contains
@ -288,7 +288,7 @@ function getopts
if [ $last_token = \^ ]
if set -q is_long_option
set -l option_value (printf $option | tr = \n)
set -l option_value (printf "%s" $option | tr = \n)
if set -q option_value[2]
# Check if it is a valid option match.
@ -350,7 +350,7 @@ function getopts
# Check if next argument exists.
if set -q argv[$__getopts_index]
# Sanitize the option-argument.
set -l value (printf $argv[$__getopts_index])
set -l value (printf "%s" $argv[$__getopts_index])
if [ -z "$value" ]
# Print any non-empty list character.
printf "\n"