Fixed some broken longopt and helpers related tests
This commit is contained in:
@@ -169,7 +169,7 @@ function cmdarg_usage
|
||||
echo "${CMDARG_INFO['header']}"
|
||||
echo
|
||||
local key
|
||||
if [[ "${#CMDARG_REQUIRED[@]}" -eq 0 ]]; then
|
||||
if [[ "${#CMDARG_REQUIRED[@]}" -ne 0 ]]; then
|
||||
echo "Required Arguments:"
|
||||
for key in "${CMDARG_REQUIRED[@]}"
|
||||
do
|
||||
@@ -177,7 +177,7 @@ function cmdarg_usage
|
||||
done
|
||||
echo
|
||||
fi
|
||||
if [[ "${#CMDARG_OPTIONAL[@]}" -eq 0 ]]; then
|
||||
if [[ "${#CMDARG_OPTIONAL[@]}" -ne 0 ]]; then
|
||||
echo "Optional Arguments":
|
||||
for key in "${CMDARG_OPTIONAL[@]}"
|
||||
do
|
||||
@@ -417,11 +417,13 @@ function cmdarg_purge
|
||||
local arr
|
||||
arrays="cmdarg_cfg CMDARG CMDARG_REV CMDARG_OPTIONAL CMDARG_REQUIRED"
|
||||
arrays="$arrays CMDARG_DESC CMDARG_DEFAULT CMDARG_VALIDATORS CMDARG_INFO"
|
||||
arrays="$arrays CMDARG_FLAGS CMDARG_TYPES"
|
||||
arrays="$arrays CMDARG_FLAGS CMDARG_TYPES cmdarg_argv cmdarg_helpers"
|
||||
for arr in $arrays
|
||||
do
|
||||
eval "$arr=()"
|
||||
done
|
||||
cmdarg_helpers['describe']=cmdarg_describe_default
|
||||
cmdarg_helpers['usage']=cmdarg_usage
|
||||
CMDARG_GETOPTLIST="h"
|
||||
}
|
||||
|
||||
|
||||
@@ -39,12 +39,12 @@ function shunittest_test_describe_helper
|
||||
|
||||
echo "${opt}:${longopt}:${argtype}:${description}:${default}:${flags}:${validator}"
|
||||
}
|
||||
cmdarg_helpers['describe']=describe
|
||||
function parser
|
||||
{
|
||||
declare -a array
|
||||
declare -A hash
|
||||
cmdarg_purge
|
||||
cmdarg_helpers['describe']=describe
|
||||
cmdarg 's:' 'string' 'some string' '12345' always_succeed
|
||||
cmdarg 'b' 'boolean' 'some boolean'
|
||||
cmdarg 'a?[]' 'array' 'some array'
|
||||
@@ -101,14 +101,13 @@ function shunittest_test_describe_and_usage_helper
|
||||
done
|
||||
}
|
||||
|
||||
cmdarg_helpers['describe']=describe
|
||||
cmdarg_helpers['usage']=usage
|
||||
|
||||
function parser
|
||||
{
|
||||
declare -a array
|
||||
declare -A hash
|
||||
cmdarg_purge
|
||||
cmdarg_helpers['describe']=describe
|
||||
cmdarg_helpers['usage']=usage
|
||||
cmdarg 's:' 'string' 'some string' '12345' always_succeed
|
||||
cmdarg 'b' 'boolean' 'some boolean'
|
||||
cmdarg 'a?[]' 'array' 'some array'
|
||||
|
||||
Reference in New Issue
Block a user