more progress, but create_game_array is horribly broken.

.includes/bottle.sh

@@ -1,81 +1,6 @@
 get_bottle() {
-    # Handles games that use the same wine bottle
+    local architecture="${1/win/}"
-    case "${game}" in
+    export WINEPREFIX="$HOME/.local/wine${architecture}"
-        # Aprone (Jeremy Kaldobsky) games.
-        "castaways"*) ;&
-        "castaways-2"*) ;&
-        "daytona-and-the-book-of-gold"*) ;&
-        "dog-who-hates-toast"*) ;&
-        "lunimals"*) ;&
-        "paw-prints"*) ;&
-        "penta-path"*) ;&
-        "preludeamals"*) ;&
-        "puzzle-divided"*) ;&
-        "rettou"*) ;&
-        "revelation"*) ;&
-        "swamp"*) ;&
-        "tarot-assistant"*) ;&
-        "triple-triad"*)
-            export WINEPREFIX="${HOME}/.local/wine/aprone" ;;
-        "bg-"*) export WINEPREFIX="${HOME}/.local/wine/bg";;
-        # draconis games
-        "esp-pinball-classic"*) ;&
-        "esp-pinball-extreme"*) ;&
-        "esp-pinball-party-pack"*) ;&
-        "silver-dollar"*) ;&
-        "monkey-business"*) ;&
-        "alien-outback"*) ;&
-        "dyna-man"*) ;&
-        "change-reaction"*) ;&
-        "ten-pin-alley"*) export WINEPREFIX="${HOME}/.local/wine/draconis";;
-        # l-works games group
-        "duck-hunt"*) ;&
-        "judgement-day"*) ;&
-        "lockpick"*) ;&
-        "pigeon-panic"*) ;&
-        "smashathon"*) ;&
-        "super-egg-hunt"*) ;&
-        "super-liam"*) ;&
-        "the-great-toy-robbery"*) export WINEPREFIX="${HOME}/.local/wine/l-works";;
-        # Nyanchan games group
-        "bokurano-daibouken"*) ;&
-        "laser-breakout"*) ;&
-        "marina-break"*) ;&
-        "mp5"*) ;&
-        "screaming-strike-2"*) ;&
-        "world-of-war"*) export WINEPREFIX="${HOME}/.local/wine/nyanchan";;
-        # Oriol Gomez games group
-        "bombercats"*) ;&
-        "copter-mission"*) ;&
-        "danger-on-the-wheel"*) ;&
-        "death-on-the-road"*) ;&
-        "fuck-that-bird"*) ;&
-        "hammer-of-glory"*) ;&
-        "insect-therapy"*) ;&
-        "rhythm-rage"*) ;&
-        "run-for-your-life"*) ;&
-        "thief"*) ;&
-        "villains-from-beyond"*) export WINEPREFIX="${HOME}/.local/wine/oriol-gomez";;
-        # pbgames group
-        "dark-destroyer"*) ;&
-        "PBGames TMP") export WINEPREFIX="$HOME/.local/wine/pbgames" ;;
-        # tunmi13 games group
-        "battle-of-the-hunter"*) ;&
-        "clashes-of-the-sky"*) ;&
-        "challenge-of-the-horse"*) export WINEPREFIX="${HOME}/.local/wine/tunmi13";;
-        # tunmi13-64bit games group
-        "battlefield-2d"*) ;&
-        "haunted-party"*) ;&
-    "skateboarder-pro"*) export WINEPREFIX="${HOME}/.local/wine/tunmi13-64bit";;
-        # Dan Z games group
-        "lost"*) ;&
-        "maze-craze"*) ;&
-        "super-deekout"*)
-            export norh="true"
-            export WINEPREFIX="$HOME/.local/wine/dan-z"
-        ;;
-        *) export WINEPREFIX="${HOME}/.local/wine/${game%|*}";;
-    esac
     # Wine version for bottles
     if [[ "$game" =~ entombed ]]; then
         install_wine "6.18" "32"
@@ -145,7 +70,7 @@ winetricks() {
 }
 
 install_rhvoice() {
-    if [[ -d "$HOME/.local/wine/${bottle}/drive_c/Program Files/Olga Yakovleva/" ]]; then
+    if [[ -d "${WINEPREFIX}/drive_c/Program Files/Olga Yakovleva/" ]]; then
         return
     fi
     if [[ "$norh" == "true" ]]; then
@@ -195,12 +120,12 @@ install_wine_bottle() {
             exit 1
         fi
     fi
-    if [[ -z "$WINEARCH" ]] || [[ "${WINEARCH}" == "win64" ]]; then
+    if [[ ( -z "$WINEARCH" || "$WINEARCH" == "win64" ) && ! "$*" =~ speechsdk ]]; then
     local architecture=64
     else
     local architecture=32
     fi
-    export WINEPREFIX="$HOME/.local/wine${architecture}"
+    export WINEPREFIX="$HOME/.local/wine${bottle:+/}${bottle:-$architecture}"
     # Arguments to the function are dependancies to be installed.
         # Get location of mono and gecko.
         monoPath="$(find /usr/share/wine/ -maxdepth 1 -type d -name mono 2> /dev/null)"
@@ -246,8 +171,7 @@ install_wine_bottle() {
 }
 
 add_launcher() {
-    local launchSettings="${game,,}"
+    local launchSettings="${WINEARCH:-win64}|${1}|${game}"
-    launchSettings="${launchSettings//[[:space:]]/-}|${1}|${game}"
     shift
     while [[ $# -gt 0 ]]; do
         launchSettings+="|$1"

.install/Bloodshed.sh

@@ -1,5 +1,4 @@
 download "${ipfsGateway}/ipfs/QmcTCTMep4zp5zTw8ZaXYpjtu9inNPn8bNzwhW6cX97egw?filename=bloodshed.exe"
-export winVer="win7"
 install_wine_bottle speechsdk
 cp "${cache}/bloodshed.exe" "$WINEPREFIX/drive_c/Program Files/"
 add_launcher "c:\Program Files\bloodshed.exe"

.install/RS Games.sh

@@ -1,8 +1,5 @@
-export version="7.0"
 download "http://rsgames.org/rsdownloads/rsgclient/rsgames-client-setup-2.01.exe" "${nvdaControllerClientDll}"
-install_wine "$version" "32"
-export winVer="win7"
 install_wine_bottle speechsdk
 ${wine} "${cache}/rsgames-client-setup-2.01.exe" /silent
-find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \;
+find "${WINEPREFIX}/drive_c/Program Files/RS Games Client" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \;
 add_launcher "c:\Program Files\RS Games Client\rsg.exe"

audiogame-manager.sh

@@ -279,8 +279,8 @@ process_launcher-flags() {
 create_game_array() {
     # Game array 0 bottle, 1 path, 2 title, 3+ flags
     for i in "${lines[@]}" ; do
-        if [[ "${game}" =~ ^${i} ]]; then
+        # Escape pipe characters in both strings for regex matching
-            # This is weird. Why do I have to set game to i before making the array?
+        if [[ "${i//|/\\|}" =~ ^${game//|/\\|}$ ]]; then
             game="$i"
             IFS='|' read -ra game <<< "$i"
             break
@@ -510,6 +510,5 @@ done
 
 [[ ${#game} -lt 1 ]] && exit 0
 
-[[ "$agmNoLaunch" != "true" ]] && winetricks sandbox
 
 [[ "$agmNoLaunch" != "true" ]] && exit 0