From 4db993a953cee47b4577547e00558e4343acd9be Mon Sep 17 00:00:00 2001
From: Castro-Fidel <tergoevm@gmail.com>
Date: Sat, 23 May 2020 14:56:20 +0300
Subject: [PATCH] minor fix

---
 data_from_portwine/scripts/restart |  3 +--
 data_from_portwine/scripts/runlib  | 12 ++++++------
 data_from_portwine/scripts/vars    |  4 ----
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/data_from_portwine/scripts/restart b/data_from_portwine/scripts/restart
index f5c044fd..2b2ee1e4 100755
--- a/data_from_portwine/scripts/restart
+++ b/data_from_portwine/scripts/restart
@@ -6,6 +6,5 @@ wine_pids=$(ls -l /proc/*/exe 2>/dev/null | grep -E 'wine(64)?-preloader|wineser
 if ! [ -z "${wine_pids}" ] ; then
     kill -9 ${wine_pids}
 fi
-STOP_PORTWINE | pwzen
 rm -f "${config_path}/dxvk_on"
-
+STOP_PORTWINE | pwzen
diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib
index a0ce5dca..0bfc00a9 100755
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -77,12 +77,12 @@ export WINEPREFIX="${PORT_WINE_PATH}/data/pfx"
 export PATH="${WINEDIR}/bin":${PATH}
 export WINESTART="C:\\windows\\command\\start.exe"
 export STEAM_COMPAT_DATA_PATH="${PORT_WINE_PATH}/data/"
-if [ "${PORT_WINE_PATH}/libs" -eq "1"  ]
-	then
-	export LD_LIBRARY_PATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine:${WINELIB}/pinned_libs_32:${WINELIB}/pinned_libs_64:/usr/lib/x86_64-linux-gnu/libfakeroot:/lib/i386-linux-gnu:/usr/lib/i386-linux-gnu:/usr/local/lib:/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:/lib:/usr/lib:/usr/lib/i386-linux-gnu/i686:/usr/lib/i386-linux-gnu/sse2:/usr/lib/i386-linux-gnu/i686/sse2:${WINELIB}/i386/lib/i386-linux-gnu:${WINELIB}/i386/lib:${WINELIB}/i386/usr/lib/i386-linux-gnu:${WINELIB}/i386/usr/lib:${WINELIB}/amd64/lib/x86_64-linux-gnu:${WINELIB}/amd64/lib:${WINELIB}/amd64/usr/lib/x86_64-linux-gnu:${WINELIB}/amd64/usr/lib"
-	else
-		export LD_LIBRARY_PATH=${WINEDIR}/lib64:${WINEDIR}/lib:${LD_LIBRARY_PATH}
-	fi
+if [ -d "${PORT_WINE_PATH}/libs" ]
+then
+    export LD_LIBRARY_PATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine:${WINELIB}/pinned_libs_32:${WINELIB}/pinned_libs_64:/usr/lib/x86_64-linux-gnu/libfakeroot:/lib/i386-linux-gnu:/usr/lib/i386-linux-gnu:/usr/local/lib:/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:/lib:/usr/lib:/usr/lib/i386-linux-gnu/i686:/usr/lib/i386-linux-gnu/sse2:/usr/lib/i386-linux-gnu/i686/sse2:${WINELIB}/i386/lib/i386-linux-gnu:${WINELIB}/i386/lib:${WINELIB}/i386/usr/lib/i386-linux-gnu:${WINELIB}/i386/usr/lib:${WINELIB}/amd64/lib/x86_64-linux-gnu:${WINELIB}/amd64/lib:${WINELIB}/amd64/usr/lib/x86_64-linux-gnu:${WINELIB}/amd64/usr/lib"
+else
+    export LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib:${LD_LIBRARY_PATH}"
+fi
 ########################################################################
 export DXVK_STATE_CACHE_PATH="${PATH_TO_GAME}"
 export DXVK_STATE_CACHE=1
diff --git a/data_from_portwine/scripts/vars b/data_from_portwine/scripts/vars
index 678a9080..96c09626 100755
--- a/data_from_portwine/scripts/vars
+++ b/data_from_portwine/scripts/vars
@@ -51,9 +51,6 @@ else        ###DXVK###
 fi
 ########################################################################
 cd "${PATH_TO_GAME}"
-rm -fr "${PORT_WINE_PATH}/data/pfx/drive_c/ProgramData/Agent/data"
-rm -fr "${PORT_WINE_PATH}/data/pfx/drive_c/users/steamuser/Blizzard Entertainment/Battle.net/Cache"
-rm -fr "${PORT_WINE_PATH}/data/pfx/drive_c/users/Public/Blizzard Entertainment/Battle.net/Cache"
 }
 ########################################################################
 ADD_IN_STOP_PORTWINE ()
@@ -63,6 +60,5 @@ echo " "
 ########################################################################
 ADD_IN_POST_INSTALL ()
 {
-rm -f "${PORT_WINE_PATH}/data/pfx/drive_c/ProgramData/Battle.net/Agent/product.db"
 `zenity --info --title "${inst_set_top}" --text "${inst_succ}" --no-wrap ` > /dev/null 2>&1  
 }