andrew/cmdarg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a bug where the #include fakery caused chained scripts that wanted to call cmdarg were unable to do so and were unable to see CMDARG_ associative arrays, so wierd things started happening

Browse Source
This commit is contained in:
Andrew Kesterson
2013-10-29 19:10:08 -04:00
parent 51b3114748
commit 5facea1cc5
1 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmdarg.sh
View File

@@ -322,20 +322,11 @@ function cmdarg_purge
arrays="cmdarg_cfg CMDARG CMDARG_REV CMDARG_OPTIONAL CMDARG_REQUIRED" arrays="cmdarg_cfg CMDARG CMDARG_REV CMDARG_OPTIONAL CMDARG_REQUIRED"
arrays="$arrays CMDARG_DESC CMDARG_DEFAULT CMDARG_VALIDATORS CMDARG_INFO" arrays="$arrays CMDARG_DESC CMDARG_DEFAULT CMDARG_VALIDATORS CMDARG_INFO"
arrays="$arrays CMDARG_FLAGS CMDARG_TYPES" arrays="$arrays CMDARG_FLAGS CMDARG_TYPES"
for arr in $arrays unset $arr
do unset $arr[*]
str='${!'"$arr"'[@]}'
for key in $(eval "echo $str")
do
str="$arr[$key]"
eval "unset $str"
done
done
CMDARG_GETOPTLIST="h" CMDARG_GETOPTLIST="h"
} }
if [[ "${_DEFINED_CMDARG}" == "" ]]; then
export _DEFINED_CMDARG=0
# Holds the final map of configuration options # Holds the final map of configuration options
declare -A cmdarg_cfg declare -A cmdarg_cfg
# Maps (short arg) -> (long arg) # Maps (short arg) -> (long arg)
@@ -358,5 +349,7 @@ if [[ "${_DEFINED_CMDARG}" == "" ]]; then
declare -A CMDARG_FLAGS declare -A CMDARG_FLAGS
# Map of (short arg) -> type (string, array, hash) # Map of (short arg) -> type (string, array, hash)
declare -A CMDARG_TYPES declare -A CMDARG_TYPES
if [[ "${CMDARG_GETOPTLIST}" == "" ]]; then
CMDARG_GETOPTLIST="h" CMDARG_GETOPTLIST="h"
fi fi