Rewrite of yadoom to better handle command line parameters.

.scripts/yadoom

@@ -1,21 +1,10 @@
 #!/usr/bin/env bash
                                                                                                                                                                           
 
-help() {
-    echo "${0##*/}"
-    echo "Released under the terms of the GPL license."
-    echo -e "This is a Stormux project: https://stormux.org\n"
-    echo -e "Usage:\n"
-    echo "With no arguments, open ${0##*/}."
-    for i in "${!command[@]}" ; do
-        echo "-${i/:/ <parameter>}: ${command[${i}]}"
-    done | sort
-    exit 0
-}
-
 # Function to check if a file is an IWAD
 is_iwad() {
     local file="$1"
+    [[ "${file,,}" =~ ipk3$ ]] && return 0
     if [[ -f "$file" ]]; then
         # Extract the first four bytes and check if they match the IWAD signature
         if hexdump -n 4 -e '4/1 "%02X"' "$file" | grep -q '^49574144$'; then
@@ -27,25 +16,7 @@ is_iwad() {
     return 1
 }
 
-                                                                                                                                                                          
+iwad_menu() {
-declare -A command=(
-    [c:]="gzdoom configuration file to be used. Default: ${XDG_CONFIG_HOME:-$HOME/.config}/gzdoom/gzdoom.ini"
-    [h]="This help screen."
-)
-configFile="${configfile:-${XDG_CONFIG_HOME:-$HOME/.config}/gzdoom/gzdoom.ini}"
-
-
-# Convert the keys of the associative array to a format usable by getopts
-args="${!command[*]}"
-args="${args//[[:space:]]/}"
-while getopts "${args}" i 2> /dev/null ; do
-    case "$i" in
-        c) configFile="${OPTARG}" ;;
-        h) help ;;
-        *) continue ;;
-    esac
-done
-
     # Extract the Path= lines from the [IWADSearch.Directories] section
     mapfile -t wadPaths < <(sed -n "/^\[IWADSearch.Directories\]/,/^\[/{/Path=/p;}" "$configFile" | cut -d '=' -f 2)
     declare -a wadList
@@ -55,7 +26,7 @@ for i in "${wadPaths[@]}"; do
         if [[ -d "$i" ]]; then
             while IFS= read -r -d $'\0' wad; do
                 is_iwad "$wad" && wadList+=("$wad")
-        done < <(find "$i" -follow -maxdepth 1 -type f -iname '*.wad' -print0)
+            done < <(find "$i" -follow -maxdepth 1 -type f \( -iname '*.wad' -o -iname '*.ipk3' \) -print0)
         fi
     done
 
@@ -82,4 +53,35 @@ yadCode="$?"
     [[ ${yadCode} -eq 0 ]] || exit 0
     iwad="${iwad#*|}"
     iwad="${iwad%|}"
-gzdoom "$@" -iwad "${iwad}"
+}
+                                                                                                                                                                          
+configFile="${XDG_CONFIG_HOME:-$HOME/.config}/gzdoom/gzdoom.ini"
+declare -a gzdoomArgs
+
+# Process arguments
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        -c)
+            configFile="$2"
+            shift 2
+            ;;
+        -iwad|-i)
+            iwad="$2"
+            gzdoomArgs+=("-iwad" "$2")
+            shift 2
+            ;;
+        *)
+            gzdoomArgs+=("$1")
+            shift
+            ;;
+    esac
+done
+
+# If no IWAD specified, show the menu
+if [[ -z "$iwad" ]]; then
+    iwad_menu
+    gzdoomArgs+=("-iwad" "$iwad")
+fi
+
+# Launch GZDoom with all arguments
+gzdoom "${gzdoomArgs[@]}"