Minor changes on build_installer.sh.

Wine version check in evelauncher.sh search now for wine.inf to determine wine build date.

5 files changed, 13 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5cce14aa0c8..bf2c0e9be478 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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 = e3c3947f688016302afbdcf8d9f26d625b428be06a1100fc3463990fa174d02a
-	sha256sums = 90ef3a46ef342e4a800aeae93ee6434b98ac3c9da45148d3a12a0688365cb060
+	sha256sums = e865cf10831a1e0cb2a615b4b97330bdeeb8b458bb3bffe0943c602073002573
+	sha256sums = e97e871bc59b35dcd437106a1cc933d7948c64b652065a597911aa64f3b8338d
 	sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21
 	sha256sums = f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c
 	sha256sums = 884a2ca2f7dae9783265fc08d0b871a8850f9c761377a1a0716ca5b3272674d2
@@ -59,7 +59,7 @@ pkgbase = evesetup
 	sha256sums = 22690e393ee89703b17898038aaa37900805104e8c960b346fe1f6050edc9bce
 	sha256sums = dbcdd9203a293b00e95d9dcc39fe170c853f698428193e32b8f048e87ab57af8
 	sha256sums = 2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d
-	sha256sums = caa49ee2664f5e0252ec633b709bea63b6815568475e7da1e3ddbc47460fe392
+	sha256sums = d2396e827bb573ba23611ed0d1668e0af86d4105bed8af5ffb43646b0f42958b
 	sha256sums = a2d53dbda08b79f2280d08b4d3b47694b41cf2508d3b508760f332d9e96ab752
 	sha256sums = 2c192fdc282fefafee5596b60bd1779668b611d386e2bf933eef51d39eac7a28
 	sha256sums = f88c7c28582b6531a021b8fcece47c906f900c48edf453dc04c349f8671cf8a2
diff --git a/PKGBUILD b/PKGBUILD
index e86268ede386..ff22c0c56814 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -103,8 +103,8 @@ package() {
 }
 
 sha256sums=('f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731'
-            'e3c3947f688016302afbdcf8d9f26d625b428be06a1100fc3463990fa174d02a'
-            '90ef3a46ef342e4a800aeae93ee6434b98ac3c9da45148d3a12a0688365cb060'
+            'e865cf10831a1e0cb2a615b4b97330bdeeb8b458bb3bffe0943c602073002573'
+            'e97e871bc59b35dcd437106a1cc933d7948c64b652065a597911aa64f3b8338d'
             '80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21'
             'f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c'
             '884a2ca2f7dae9783265fc08d0b871a8850f9c761377a1a0716ca5b3272674d2'
@@ -112,7 +112,7 @@ sha256sums=('f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731'
             '22690e393ee89703b17898038aaa37900805104e8c960b346fe1f6050edc9bce'
             'dbcdd9203a293b00e95d9dcc39fe170c853f698428193e32b8f048e87ab57af8'
             '2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d'
-            'caa49ee2664f5e0252ec633b709bea63b6815568475e7da1e3ddbc47460fe392'
+            'd2396e827bb573ba23611ed0d1668e0af86d4105bed8af5ffb43646b0f42958b'
             'a2d53dbda08b79f2280d08b4d3b47694b41cf2508d3b508760f332d9e96ab752'
             '2c192fdc282fefafee5596b60bd1779668b611d386e2bf933eef51d39eac7a28'
             'f88c7c28582b6531a021b8fcece47c906f900c48edf453dc04c349f8671cf8a2'
diff --git a/build_installer.sh b/build_installer.sh
index 9ab9b48e29f8..f697e0af123d 100755
--- a/build_installer.sh
+++ b/build_installer.sh
@@ -75,8 +75,7 @@ echo "done."
 
 printf "\nRepack evelauncher-$version.tar.gz..."
 cd ../
-tar czf evelauncher-$version.tar.gz evelauncher/
-mv evelauncher-$version.tar.gz evesetup/
+tar czf evesetup/evelauncher-$version.tar.gz evelauncher/
 rm -rf evelauncher/
 echo "done."
 
diff --git a/evelauncher.sh b/evelauncher.sh
index 85fe4a4543ed..30bc0a8c7c09 100644
--- a/evelauncher.sh
+++ b/evelauncher.sh
@@ -54,11 +54,9 @@ check_wine() {
     fi
     if [ -x "$WINEPATH/wine" ] ;then
 	INSTWINE=$(cat $WINEPREFIX/.update-timestamp 2>/dev/null) || true
-	for CMD in wine wine64 wineserver ;do
-	    WINECMD=$(readlink -f "$WINEPATH/$CMD")
-	    WINEDATE=$(ls -l --time-style=+%s "$WINECMD" 2>/dev/null | cut -d' ' -f6)
-	    test "x$WINEDATE" = "x$INSTWINE" && break
-	done
+	WINEPATH=$(readlink -f "$CUSTOMWP")
+	WINECONF=$(find "${WINEPATH%/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"
 	    env WINEARCH=win32 \
diff --git a/evelauncher.sh.in b/evelauncher.sh.in
index fe7163793986..f7806816d972 100644
--- a/evelauncher.sh.in
+++ b/evelauncher.sh.in
@@ -65,11 +65,9 @@ check_wine() {
     fi
     if [ -x "$WINEPATH/wine" ] ;then
 	INSTWINE=$(cat $WINEPREFIX/.update-timestamp 2>/dev/null) || true
-	for CMD in wine wine64 wineserver ;do
-	    WINECMD=$(readlink -f "$WINEPATH/$CMD")
-	    WINEDATE=$(ls -l --time-style=+%s "$WINECMD" 2>/dev/null | cut -d' ' -f6)
-	    test "x$WINEDATE" = "x$INSTWINE" && break
-	done
+	WINEPATH=$(readlink -f "$CUSTOMWP")
+	WINECONF=$(find "${WINEPATH%/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"
 	    env WINEARCH=win32 \