Merge branch 'testing' for new binary release.

audiogame-manager.sh

@@ -195,16 +195,6 @@ checklist() {
     else
         errorList+=("Warning: unix2dos is not installed. Some games need a configuration file in dos format before they will run.")
     fi
-    if [[ -d /usr/share/wine/gecko/ ]]; then
-        echo "Found wine gecko."
-    else
-    errorList+=("Warning: Wine gecko not found, some games may not work.")
-    fi
-    if [[ -d /usr/share/wine/mono/ ]]; then
-        echo "Found wine mono."
-    else
-    errorList+=("Warning: Wine mono not found, some games may not work.")
-    fi
     if command -v xclip &> /dev/null ; then
         echo "Xclip is installed."
     else
@@ -279,6 +269,10 @@ install_wine_bottle() {
     export WINEARCH="${WINEARCH:-win32}"
     local bottle="${game,,}"
     bottle="${bottle//[[:space:]]/-}"
+    if [[ -d "$HOME/.local/wine/${bottle}" ]]; then
+        echo "$HOME/.local/wine/${bottle} exists. Please remove it before running this installer."
+        exit 1
+    fi
     mkdir -p "$HOME/.local/wine/${bottle}"
     export WINEPREFIX="$HOME/.local/wine/${bottle}"
     # Arguments to the function are dependancies to be installed.
@@ -613,6 +607,7 @@ declare -A command=(
     [d]="Debug mode, wine will be much more verbose when games are launched with this flag."
     [h]="This help screen."
     [i]="Install games."
+    [I:]="Noninteractive game installation."
     [k]="Kill a running game that is stuck."
     [L]="Display license information."
     [l:]="Launch given game without interactive audiogame-manager menu specified by its wine bottle."
@@ -633,6 +628,9 @@ while getopts "${args}" i ; do
         ;;
         h) help;;
         i) game_installer;;
+        I)
+            game="${OPTARG}"
+            break;;
         k) kill_game;;
         L) license;;
         l) game_launcher "${OPTARG}";;
@@ -1262,7 +1260,8 @@ EOF
         open_url "https://patreon.com/stormux"
     ;;
     *)
-        exit 0
+        [[ -n "${game}" ]] && echo "Game \"${game}\" not found."
+        exit 1
     ;;
 esac