WineSteam flatpak performance improved

read_config.sh

@@ -25,7 +25,8 @@ if [ "x$WINESTEAM_DATA" = "x" ]; then
 fi
 
 export WINESTEAM_PKGS="$WINESTEAM_DATA/packages"
-echo "export WINESTEAM_VERSION=\"v0.3.2\""
+export WINESTEAM_BIN="$PWD"
+echo "export WINESTEAM_VERSION=\"v0.4.0\""
 echo "export WINEARCH=win64"
 echo "export WINESTEAM_CFG=\"$WINESTEAM_CFG\""
 echo "export WINESTEAM_BIN=\"$PWD\""
@@ -35,12 +36,12 @@ echo "export WINESTEAM_TMP=\"$WINESTEAM_DATA/tmp\""
 echo "export WINESTEAM_PKGS=\"$WINESTEAM_DATA/packages\""
 echo "export WINEPREFIX=\"$WINESTEAM_DATA/prefix\""
 echo "export WINE_LARGE_ADDRESS_AWARE=1"
+echo "export WINEDLLOVERRIDES=\"d3d11=b,dxgi=b\""
+echo "export WINEDEBUG=-all"
+echo "export DXVK_LOG_LEVEL=none"
 echo "export FREETYPE_PROPERTIES=\"truetype:interpreter-version=35\""
 echo "export PATH=\"$WINESTEAM_BIN/wine-ge/bin:$WINESTEAM_BIN:$WINESTEAM_PKGS/bin:$WINESTEAM_PKGS/lutris-GE-Proton8-26-x86_64/bin:$PATH\""
 echo "export WINESTEAM_RUNNER_PID_PATH=\"$WINESTEAM_DATA/ws_runner_pid\""
 echo "export WINESTEAM_FLATPAK_PID_PATH=\"$WINESTEAM_DATA/ws_flatpak_pid\""
 echo "export WINESTEAM_IPC_PATH=\"$WINESTEAM_DATA/winesteam_ipc.txt\""
-if [ "x$FLATPAK_ID" = "xio.github.gleammerray.WineSteam" ]; then
-  echo "export GST_PLUGIN_SYSTEM_PATH=\"$WINESTEAM_BIN/wine-ge/lib/gstreamer-1.0:$WINESTEAM_BIN/wine-ge/lib64/gstreamer-1.0\""
-fi
 echo "export WINESTEAM_STEAM_OPTIONS=\"-cef-disable-gpu\""

winesteam.sh

@@ -331,29 +331,31 @@ if [ "x$WINESTEAM_INSTALL_DXVK" = "x" ]; then
     fi
   fi
 
-  WINESTEAM_INSTALL_YN="`wsInputYN "?:[0/2]: Do you wish to modify default WineSteam install path? (~/.winesteam) [y/N]: "`"
-  WINESTEAM_INSTALL_YN=$(echo ${WINESTEAM_INSTALL_YN:-'n'} | tr '[:upper:]' '[:lower:]')
-  if [ "$WINESTEAM_INSTALL_YN" != 'n' ]; then
-    export WINESTEAM_INSTALL_PATH="`wsInputDir`/WineSteam"
-    if [ "x$WINESTEAM_INSTALL_PATH" = "x" ]; then
-      wsInfo "Installation cancelled."
-      exit
-    else
-      mkdir -p "$WINESTEAM_INSTALL_PATH"
-      if [ "`ls -A "$WINESTEAM_INSTALL_PATH"`" ]; then
-        wsInfo "F: Installation path is not empty: $WINESTEAM_INSTALL_PATH"
-        exit 1
-      fi
-      if [ ! -d "$WINESTEAM_INSTALL_PATH" ]; then
-        wsInfo "F: Bad installation path: $WINESTEAM_INSTALL_PATH"
-        exit 1
+  if [ "x$FLATPAK_ID" != "xio.github.gleammerray.WineSteam" ]; then
+    WINESTEAM_INSTALL_YN="`wsInputYN "?:[0/2]: Do you wish to modify default WineSteam install path? (~/.winesteam) [y/N]: "`"
+    WINESTEAM_INSTALL_YN=$(echo ${WINESTEAM_INSTALL_YN:-'n'} | tr '[:upper:]' '[:lower:]')
+    if [ "$WINESTEAM_INSTALL_YN" != 'n' ]; then
+      export WINESTEAM_INSTALL_PATH="`wsInputDir`/WineSteam"
+      if [ "x$WINESTEAM_INSTALL_PATH" = "x" ]; then
+        wsInfo "Installation cancelled."
+        exit
+      else
+        mkdir -p "$WINESTEAM_INSTALL_PATH"
+        if [ "`ls -A "$WINESTEAM_INSTALL_PATH"`" ]; then
+          wsInfo "F: Installation path is not empty: $WINESTEAM_INSTALL_PATH"
+          exit 1
+        fi
+        if [ ! -d "$WINESTEAM_INSTALL_PATH" ]; then
+          wsInfo "F: Bad installation path: $WINESTEAM_INSTALL_PATH"
+          exit 1
+        fi
+        echo "WINESTEAM_DATA=\"$WINESTEAM_INSTALL_PATH\"" >> "$WINESTEAM_CFG"
       fi
-      echo "WINESTEAM_DATA=\"$WINESTEAM_INSTALL_PATH\"" >> "$WINESTEAM_CFG"
     fi
+    cd "`dirname "$0"`"
+    eval "`bash read_config.sh`"
   fi
-  cd "`dirname "$0"`"
-  eval "`bash read_config.sh`"
-  wsNotify "?:[0/2]: Installing to \"$WINESTEAM_INSTALL_PATH\""
+  wsNotify "?:[0/2]: Installing to \"$WINESTEAM_DATA\""
 
   WINESTEAM_INSTALL_DXVK="`wsInputYN "?:[1/2]: DXVK greatly improves performance in all Wine applications. Some hardware/Wine versions/applications don't work well with DXVK. Install DXVK? [Y/n]: "`"
   WINESTEAM_INSTALL_DXVK=$(echo ${WINESTEAM_INSTALL_DXVK:-'y'} | tr '[:upper:]' '[:lower:]')
@@ -424,9 +426,8 @@ if [ "x$FLATPAK_ID" != "xio.github.gleammerray.WineSteam" ]; then
   fi
 fi
 wsNotify '[2/5] Creating a Wine prefix... [⌂]'
-wsInfo "A Wine prefix configuration window will open, please press \"Ok\" if you don't know what to change."
 mkdir -p "$WINEPREFIX";
-winecfg
+wine wineboot
 winetricks win10
 if [ "$WINESTEAM_INSTALL_DXVK" = "y" ]; then
   wsNotify '[3/5] Installing DXVK... [⌂]'