Various script improvements

run.sh

@@ -1,25 +1,48 @@
 #!/bin/bash
 set -eu
 
-PROJECT="ArchiSteamFarm"
-OUT="out/source"
-
 CONFIG_PATH="config/ASF.json"
 
 cd "$(dirname "$(readlink -f "$0")")"
 
-if [[ -z "${ASF_ARGS-}" ]]; then
-	ASF_ARGS=""
+SCRIPT_DIR="$(pwd)"
+
+BINARY="${SCRIPT_DIR}/$ArchiSteamFarm/out/source/$ArchiSteamFarm.dll"
+BINARY_ARGS=()
+
+PATH_NEXT=0
+
+PARSE_ARG() {
+	BINARY_ARGS+=("$1")
+
+	case "$1" in
+		--cryptkey|--server|--service) ;;
+		--path) PATH_NEXT=1 ;;
+		--path=*) cd "$(echo "$1" | cut -d '=' -f 2-)" ;;
+		*)
+			if [[ "$PATH_NEXT" -eq 1 ]]; then
+				PATH_NEXT=0
+				cd "$1"
+			fi
+	esac
+}
+
+if [[ -n "${ASF_ARGS-}" ]]; then
+	for ARG in $ASF_ARGS; do
+		if [[ -n "$ARG" ]]; then
+			PARSE_ARG "$ARG"
+		fi
+	done
 fi
 
-ASF_ARGS+=" $*"
-
-for ARG in $ASF_ARGS; do
-	case "$ARG" in
-		--path=*) CONFIG_PATH="$(echo "$ARG" | cut -d '=' -f 2-)/${CONFIG_PATH}" ;;
-	esac
+for ARG in "$@"; do
+	if [[ -n "$ARG" ]]; then
+		PARSE_ARG "$ARG"
+	fi
 done
 
+CONFIG_PATH="$(pwd)/${CONFIG_PATH}"
+
 # Kill underlying ASF process on shell process exit
 trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM
 
@@ -30,13 +53,11 @@ fi
 
 dotnet --info
 
-cd "${PROJECT}/${OUT}"
-
 if [[ -f "$CONFIG_PATH" ]] && grep -Eq '"Headless":\s+?true' "$CONFIG_PATH"; then
 	# We're running ASF in headless mode so we don't need STDIN
-	dotnet exec "${PROJECT}.dll" $ASF_ARGS & # Start ASF in the background, trap will work properly due to non-blocking call
+	dotnet exec "$BINARY" "${BINARY_ARGS[@]}" & # Start ASF in the background, trap will work properly due to non-blocking call
 	wait $! # This will forward dotnet error code, set -e will abort the script if it's non-zero
 else
 	# We're running ASF in non-headless mode, so we need STDIN to be operative
-	dotnet exec "${PROJECT}.dll" $ASF_ARGS # Start ASF in the foreground, trap won't work until process exit
+	dotnet exec "$BINARY" "${BINARY_ARGS[@]}" # Start ASF in the foreground, trap won't work until process exit
 fi