A little more progress on refactor.

.includes/bottle.sh

@@ -111,9 +111,10 @@ install_wine_bottle() {
     # Set the WINE and WINESERVER environmental variables so winetricks will use the right installation.
     export WINE="${wine}"
     export WINESERVER="${wine}server"
-    # Installation paths are based on WINEARCH unless bottle is set.
-    if [[ ${#bottle} -gt 0 ]]; then
-        local bottle="${game,,}"
+    # Installation paths are based on WINEARCH unless game is set for custom bottle.
+    local bottle=""
+    if [[ ${#game} -gt 0 ]]; then
+        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."