Merge branch 'develop'

Author: moebrowne

README.md

@@ -20,6 +20,9 @@ fi
 # --debug 3
 DEBUG_LEVEL="$(argValue "debug")" # 3
 
+# --max-size=1024
+MAX_SIZE="$(argValue "max-size")" # 1024
+
 # -R 0
 [ "$(argValue "R")" == "0" ] && echo "Recursive depth 0"
 
@@ -58,6 +61,11 @@ if argExists 'long-argument-name'; then
 	# Do something awesome
 fi
 
+# --protocol=HTTP
+if argExists 'protocol'; then
+	# Do something awesome
+fi
+
 # -O 43
 argExists 'r' && echo "Found the -O argument"
 ```
@@ -69,11 +77,13 @@ argExists 'r' && echo "Found the -O argument"
 ```bash
 -a
 -X
+-2
 -b somevalue
 -c 38
 -d "some value with spaces"
 -e "some value with
 newlines"
+-7 "ate nine"
 ```
 
 ### Long Form
@@ -86,13 +96,28 @@ newlines"
 --long-parameter
 --newline "
 "
+--1337
+--365 "days"
+```
+
+### Long Form With Value
+
+```bash
+--lang="en"
+--crawl=false
+--match-pattern=".+"
+--newline="
+"
+--UpperCase=sensitive
+--45="25+20"
 ```
 
 ### Chained Short Form Arguments
 
 ```bash
 -aih	# Equivalent to -a -i -h
 -dav 4	# Equivalent to -d -a -v 4
+-H3cx	# Equivalent to -H -3 -c -x
 ```
 
 ## Argument Order

argument-parser.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
 
 # Define the regex for matching the arguments
-regexArgShort='^-([a-zA-Z])$'
-regexArgShortChained='^-([a-zA-Z]{2,})$'
-regexArgLong='^--([a-zA-Z\-]{2,})$'
+regexArgShort='^-([a-zA-Z0-9])$'
+regexArgShortChained='^-([a-zA-Z0-9]{2,})$'
+regexArgLong='^--([a-zA-Z0-9\-]{2,})$'
+regexArgLongWithValue='^--([a-zA-Z0-9\-]{2,})=(.*)$'
 
 argChunks=()
 
@@ -63,6 +64,20 @@ for argChunk in "${argChunks[@]}"; do
 		continue;
 	fi
 
+	# Check if this chunk is a long form with value argument
+	[[ $argChunk =~ $regexArgLongWithValue ]]
+	if [ "${BASH_REMATCH[1]}" != "" ]; then
+		argument="${BASH_REMATCH[1]}"
+		lastArgument="$argument"
+
+		# Add the argument to the arguments array
+		args["${BASH_REMATCH[1]}"]="${BASH_REMATCH[2]}"
+
+		[ $ARG_DEBUG == true ] && echo "Argument (long with value): ${BASH_REMATCH[1]}=${BASH_REMATCH[2]}"
+
+		continue;
+	fi
+
 	# Check if this chunk is a long form argument
 	[[ $argChunk =~ $regexArgLong ]]
 	if [ "${BASH_REMATCH[1]}" != "" ]; then