Wine version check in evelauncher.sh of version <=3.20 removed because wine stable are now 4.0

Added winetricks call in evelauncher.sh which reinstall winetricks verbs after changing used wine

4 files changed, 26 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b69a55c1a024..e27ecac461f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = evesetup
 	pkgdesc = An inofficial EVE Online Launcher Setup Tool.
 	pkgver = 1385477
-	pkgrel = 1
+	pkgrel = 2
 	url = https://forums.eveonline.com/t/eve-installing/71494
 	arch = x86_64
 	license = custom
@@ -50,8 +50,8 @@ pkgbase = evesetup
 	source = https://github.com/megastep/makeself/releases/download/release-2.4.0/makeself-2.4.0.run
 	source = https://binaries.eveonline.com/evelauncher-1385477.tar.gz
 	sha256sums = f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731
-	sha256sums = 652b1db2fe8c5aa30779b1002bba2301a6e1532c0b91cc04efef5f540da504e8
-	sha256sums = 04dd517cf7689eac4e99440ebfc8c890078fd1519281d45918d705307fc09ce1
+	sha256sums = 01c72f0998722aa8cca81627c15ca05126e121e070f5d210c6dbf8be9f1e293b
+	sha256sums = f9262a587b596ed4cd4e2aa4fadfc858424334448d5a5a7f24ca78f5bf58fcb3
 	sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21
 	sha256sums = f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c
 	sha256sums = d0225e14dd3f619bf6540df134b5545e13bfb0954616a329c48d5eb768862eda
diff --git a/PKGBUILD b/PKGBUILD
index 4de4e1cbf04f..f4867a054b88 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 #Maintainer: Gharim Turen <gharim@turen.de>
 pkgname=evesetup
 pkgver=1385477
-pkgrel=1
+pkgrel=2
 pkgdesc="An inofficial EVE Online Launcher Setup Tool."
 arch=(x86_64)
 url="https://forums.eveonline.com/t/eve-installing/71494"
@@ -103,8 +103,8 @@ package() {
 }
 
 sha256sums=('f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731'
-            '652b1db2fe8c5aa30779b1002bba2301a6e1532c0b91cc04efef5f540da504e8'
-            '04dd517cf7689eac4e99440ebfc8c890078fd1519281d45918d705307fc09ce1'
+            '01c72f0998722aa8cca81627c15ca05126e121e070f5d210c6dbf8be9f1e293b'
+            'f9262a587b596ed4cd4e2aa4fadfc858424334448d5a5a7f24ca78f5bf58fcb3'
             '80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21'
             'f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c'
             'd0225e14dd3f619bf6540df134b5545e13bfb0954616a329c48d5eb768862eda'
diff --git a/evelauncher.sh b/evelauncher.sh
index 36064b576335..ca810afd31ed 100644
--- a/evelauncher.sh
+++ b/evelauncher.sh
@@ -58,7 +58,7 @@ check_wine() {
 	WINECONF=$(find ${WINEINFP%/bin*}/share -name 'wine.inf' 2>/dev/null) || true
 	WINEDATE=$(ls -l --time-style=+%s "$WINECONF" 2>/dev/null | cut -d' ' -f6)
 	if [ "x$WINEDATE" != "x$INSTWINE" ] ;then
-	    launcher_msg "Preparing/Updating wine in $WINEPREFIX"
+	    launcher_msg "Preparing wine in $WINEPREFIX"
 	    env WINEARCH=win32 \
 		WINEPREFIX=$WINEPREFIX \
 		WINEDEBUG=-all \
@@ -70,11 +70,15 @@ check_wine() {
 	    env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg add \
 		'HKEY_CURRENT_USER\Software\Wine\DllOverrides' \
 		/v winemenubuilder.exe /f >/dev/null
-	    if [ "x$($WINEPATH/wine --version | grep -q 3.2 ;echo $?)" != "x0" ] ;then
-		if [ "x$($WINEPATH/wine --version | grep -q 4.0 ;echo $?)" != "x0" ] ;then
-		    env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \
-			$(which winetricks) -q winxp >/dev/null
-		fi
+	    WINETRP=$(grep -v winxp $WINEPREFIX/winetricks.log 2>/dev/null | uniq)
+	    if [ "x$WINETRP" != "x" ] ;then
+		rm $WINEPREFIX/winetricks.log
+		env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \
+		    $(which winetricks) -q --force $WINETRP >/dev/null
+	    fi
+	    if [ "x$($WINEPATH/wine --version | grep -q 4.0 ;echo $?)" != "x0" ] ;then
+		env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \
+		    $(which winetricks) -q winxp >/dev/null
 	    fi
 	fi
     else
diff --git a/evelauncher.sh.in b/evelauncher.sh.in
index a19106c1cd5d..04d7bfd55b33 100644
--- a/evelauncher.sh.in
+++ b/evelauncher.sh.in
@@ -69,7 +69,7 @@ check_wine() {
 	WINECONF=$(find ${WINEINFP%/bin*}/share -name 'wine.inf' 2>/dev/null) || true
 	WINEDATE=$(ls -l --time-style=+%s $WINECONF 2>/dev/null | cut -d' ' -f6)
 	if [ "x$WINEDATE" != "x$INSTWINE" ] ;then
-	    launcher_msg "Preparing/Updating wine in $WINEPREFIX"
+	    launcher_msg "Preparing wine in $WINEPREFIX"
 	    env WINEARCH=win32 \
 		WINEPREFIX=$WINEPREFIX \
 		WINEDEBUG=-all \
@@ -81,11 +81,15 @@ check_wine() {
 	    env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg add \
 		'HKEY_CURRENT_USER\Software\Wine\DllOverrides' \
 		/v winemenubuilder.exe /f >/dev/null
-	    if [ "x$($WINEPATH/wine --version | grep -q 3.2 ;echo $?)" != "x0" ] ;then
-		if [ "x$($WINEPATH/wine --version | grep -q 4.0 ;echo $?)" != "x0" ] ;then
-		    env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \
-			$(which winetricks) -q winxp >/dev/null
-		fi
+	    WINETRP=$(grep -v winxp $WINEPREFIX/winetricks.log 2>/dev/null | uniq)
+	    if [ "x$WINETRP" != "x" ] ;then
+		rm $WINEPREFIX/winetricks.log
+		env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \
+		    $(which winetricks) -q --force $WINETRP >/dev/null
+	    fi
+	    if [ "x$($WINEPATH/wine --version | grep -q 4.0 ;echo $?)" != "x0" ] ;then
+		env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \
+		    $(which winetricks) -q --force winxp >/dev/null
 	    fi
 	fi
     else