Merge branch 'develop'

Author: moebrowne

README.md

@@ -67,7 +67,7 @@ if argExists 'protocol'; then
 fi
 
 # -O 43
-argExists 'r' && echo "Found the -O argument"
+argExists 'O' && echo "Found the -O argument"
 ```
 
 ## Supported Argument Formats
@@ -128,6 +128,7 @@ The order the arguments are passed on the command line makes a difference
 
 * Calling `my-script.sh -f first -f last` will cause `argValue "f"` to return the value `last`
 * Calling `my-script.sh -g 345 -g` will mean cause `argValue "g"` to return nothing
+* Calling `my-script.sh --size 512 --size=1024` will mean cause `argValue "size"` to return 1024
 
 ## Debug Mode
 

argument-parser.sh

@@ -42,7 +42,7 @@ done
 [ $ARG_DEBUG == true ] && echo "Expanded argument list: ${argChunks[@]}"
 
 # Initialise some variables
-declare -A args
+declare -A argv
 lastWasArgument=0
 lastArgument=""
 
@@ -57,7 +57,7 @@ for argChunk in "${argChunks[@]}"; do
 		lastArgument="$argument"
 
 		# Add the argument to the arguments array
-		args["${BASH_REMATCH[1]}"]=''
+		argv["${BASH_REMATCH[1]}"]=''
 
 		[ $ARG_DEBUG == true ] && echo "Argument (short): ${BASH_REMATCH[1]}"
 
@@ -71,7 +71,7 @@ for argChunk in "${argChunks[@]}"; do
 		lastArgument="$argument"
 
 		# Add the argument to the arguments array
-		args["${BASH_REMATCH[1]}"]="${BASH_REMATCH[2]}"
+		argv["${BASH_REMATCH[1]}"]="${BASH_REMATCH[2]}"
 
 		[ $ARG_DEBUG == true ] && echo "Argument (long with value): ${BASH_REMATCH[1]}=${BASH_REMATCH[2]}"
 
@@ -86,7 +86,7 @@ for argChunk in "${argChunks[@]}"; do
 		lastArgument="$argument"
 
 		# Add the argument to the arguments array
-		args["${BASH_REMATCH[1]}"]=''
+		argv["${BASH_REMATCH[1]}"]=''
 
 		[ $ARG_DEBUG == true ] && echo "Argument (long): ${BASH_REMATCH[1]}"
 
@@ -97,7 +97,7 @@ for argChunk in "${argChunks[@]}"; do
 	if [ $lastWasArgument == 1 ]; then
 
 		# Add the arguments value to the arguments array
-		args["$lastArgument"]="$argChunk"
+		argv["$lastArgument"]="$argChunk"
 
 		[ $ARG_DEBUG == true ] && echo "Argument Value: $argChunk"
 
@@ -106,13 +106,13 @@ for argChunk in "${argChunks[@]}"; do
 done
 
 [ $ARG_DEBUG == true ] && echo "Argument array:"
-[ $ARG_DEBUG == true ] && for k in "${!args[@]}"
+[ $ARG_DEBUG == true ] && for k in "${!argv[@]}"
 do
-    echo "ARG: $k = ${args[$k]}"
+    echo "ARG: $k = ${argv[$k]}"
 done
 
 argExists() {
-	if [ -z ${args["$1"]+abc} ]; then
+	if [ -z ${argv["$1"]+abc} ]; then
 		return 1
 	else
 		return 0
@@ -121,6 +121,11 @@ argExists() {
 
 argValue() {
 	if argExists "$1"; then
-		echo "${args["$1"]}"
+		echo "${argv["$1"]}"
 	fi
 }
+
+# Add the standard argc variable containing the number of arguments
+argc=${#argv[@]}
+
+[ $ARG_DEBUG == true ] && echo "Argument Count: $argc"