diff options
| author | kate.ward <kate.ward@forestent.com> | 2010-03-18 00:25:34 +0000 |
|---|---|---|
| committer | kate.ward <kate.ward@forestent.com> | 2010-03-18 00:25:34 +0000 |
| commit | 9a183b8fa2dbe49701f1a26bbca812aa823c0422 (patch) | |
| tree | 6688cb23dd768dbd90f32f4432793eaf916b3d0a /source/1.0/src | |
| parent | c12b30cebb92b49c5edb6df255c0952c65b4ddc6 (diff) | |
| download | shflags-9a183b8fa2dbe49701f1a26bbca812aa823c0422.tar.gz | |
fixed expn usage bug under FreeBSD 7.2
Diffstat (limited to 'source/1.0/src')
| -rw-r--r-- | source/1.0/src/shflags | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/source/1.0/src/shflags b/source/1.0/src/shflags index f69928e..aaea760 100644 --- a/source/1.0/src/shflags +++ b/source/1.0/src/shflags @@ -78,7 +78,7 @@ # return if FLAGS already loaded [ -n "${FLAGS_VERSION:-}" ] && return 0 -FLAGS_VERSION='1.0.3' +FLAGS_VERSION='1.0.4pre' # return values FLAGS_TRUE=0 @@ -508,10 +508,12 @@ _flags_validateFloat() flags_return=${FLAGS_TRUE} case ${_flags_float_} in -*) # negative floats - _flags_test_=`expr "${_flags_float_}" : '\(-[0-9][0-9]*\.[0-9][0-9]*\)'` + _flags_test_=`expr -- "${_flags_float_}" :\ + '\(-[0-9][0-9]*\.[0-9][0-9]*\)'` ;; *) # positive floats - _flags_test_=`expr "${_flags_float_}" : '\([0-9][0-9]*\.[0-9][0-9]*\)'` + _flags_test_=`expr -- "${_flags_float_}" :\ + '\([0-9][0-9]*\.[0-9][0-9]*\)'` ;; esac [ "${_flags_test_}" != "${_flags_float_}" ] && flags_return=${FLAGS_FALSE} @@ -534,10 +536,10 @@ _flags_validateInteger() flags_return=${FLAGS_TRUE} case ${_flags_int_} in -*) # negative ints - _flags_test_=`expr "${_flags_int_}" : '\(-[0-9][0-9]*\)'` + _flags_test_=`expr -- "${_flags_int_}" : '\(-[0-9][0-9]*\)'` ;; *) # positive ints - _flags_test_=`expr "${_flags_int_}" : '\([0-9][0-9]*\)'` + _flags_test_=`expr -- "${_flags_int_}" : '\([0-9][0-9]*\)'` ;; esac [ "${_flags_test_}" != "${_flags_int_}" ] && flags_return=${FLAGS_FALSE} @@ -661,14 +663,14 @@ _flags_parseGetopt() --) shift; break ;; # discontinue option parsing --*) # long option - _flags_opt_=`expr "${_flags_opt_}" : '--\(.*\)'` + _flags_opt_=`expr -- "${_flags_opt_}" : '--\(.*\)'` _flags_len_=${__FLAGS_LEN_LONG} if _flags_itemInList "${_flags_opt_}" ${__flags_longNames}; then _flags_name_=${_flags_opt_} else # check for negated long boolean version if _flags_itemInList "${_flags_opt_}" ${__flags_boolNames}; then - _flags_name_=`expr "${_flags_opt_}" : 'no\(.*\)'` + _flags_name_=`expr -- "${_flags_opt_}" : 'no\(.*\)'` _flags_type_=${__FLAGS_TYPE_BOOLEAN} _flags_arg_=${__FLAGS_NULL} fi @@ -676,7 +678,7 @@ _flags_parseGetopt() ;; -*) # short option - _flags_opt_=`expr "${_flags_opt_}" : '-\(.*\)'` + _flags_opt_=`expr -- "${_flags_opt_}" : '-\(.*\)'` _flags_len_=${__FLAGS_LEN_SHORT} if _flags_itemInList "${_flags_opt_}" ${__flags_shortNames}; then # yes. match short name to long name. note purposeful off-by-one @@ -947,7 +949,7 @@ flags_help() flags_defaultStr_="(default: ${flags_defaultStr_})" flags_helpStr_=" ${flags_flagStr_} ${flags_help_} ${flags_defaultStr_}" - flags_helpStrLen_=`expr "${flags_helpStr_}" : '.*'` + flags_helpStrLen_=`expr -- "${flags_helpStr_}" : '.*'` flags_columns_=`_flags_columns` if [ ${flags_helpStrLen_} -lt ${flags_columns_} ]; then echo "${flags_helpStr_}" >&2 @@ -958,7 +960,7 @@ flags_help() flags_emptyStr_="`echo \"x${flags_flagStr_}x\" \ |awk '{printf "%"length($0)-2"s", ""}'`" flags_helpStr_=" ${flags_emptyStr_} ${flags_defaultStr_}" - flags_helpStrLen_=`expr "${flags_helpStr_}" : '.*'` + flags_helpStrLen_=`expr -- "${flags_helpStr_}" : '.*'` if [ ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_STD} \ -o ${flags_helpStrLen_} -lt ${flags_columns_} ]; then # indented to match help string |