fix argument parsing

strm

@@ -27,16 +27,21 @@ fi
 
 # Set default values
 config="$HOME/.config/strm/strm.config"
+list=false
 shuffle=false
+query=""
 
 # Parse arguments
-list=false
+while (( "$#" )); do
-for arg in "$@"; do
+    case "$1" in
-    case $arg in
         -c|--config)
+	    if [ -n "$2" ] && [ "${2:0:1}" != "-" ]; then
 		config="$2"
-            shift
+		shift 2
-            shift
+	    else
+		echo "Argument for $1 is missing"
+		exit 1
+	    fi
             ;;
         -h|--help)
             print_usage
@@ -50,7 +55,7 @@ for arg in "$@"; do
             shift
             ;;
         *)
-            query+=("$1")
+            query="$query\*$1"
             shift
             ;;
     esac
@@ -82,16 +87,13 @@ if [ "$config_valid" == false ]; then
     echo "Please check your config file ($config)"
     exit 1
 fi
-if [ "${#query[@]}" == 0 ]; then
+if [ "$query" == "" ]; then
     print_usage
 fi
 
-# Build search string from input arguments
-query="\*$( IFS=$'*'; echo "${query[*]}" )\*"
-
 # Get search results from remote
 # Look for paths matching given queries in visible directories, listing only filenames and links
-mapfile -t results < <(ssh "$connection_string" find "$media_directory" -not -path \"*/\.*\" -type l,f -ipath "$query" | sort)
+mapfile -t results < <(ssh "$connection_string" find "$media_directory" -not -path \"*/\.*\" -type l,f -ipath "$query\*" | sort)
 
 # List files
 if [ "$list" == false ]; then