Removed QTVER variable from evelauncher.sh (only needed by independed evelauncher.sh script).

Test for registry entry of winemenubuilder added to speedup the launch process.
Fixed a bug in evewine which made it impossible to use the full path for this script.
Set timestamp for all files in the evelauncher directory before creating the library in setup.sh.in

6 files changed, 24 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 34ce9f4a44f7..acaa3250cfc6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = evesetup
 	pkgdesc = An inofficial EVE Online Launcher Setup Tool.
 	pkgver = 1548102
-	pkgrel = 3
+	pkgrel = 4
 	url = https://forums.eveonline.com/t/eve-installing/71494
 	arch = x86_64
 	license = custom
@@ -52,19 +52,19 @@ 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-1548102.tar.gz
 	sha256sums = ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4
-	sha256sums = 892668cc9ceff769beba2d0b286566937de28ad4b1c245cba5cbb1113e74a4c9
+	sha256sums = e9c2145865e425a13fa38f433f2aec0574c44950442dffb900ae41085bfe7566
 	sha256sums = b1faa042a96746fe80ea5d85a0c26e80b29353394897774f45b9e48e0639a1d8
 	sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21
-	sha256sums = 55490eb289afd5526a470d5df20cd1a97bb5b2b11c14defa3b36c7f354676237
+	sha256sums = 893a749d7aff5ee1f5e9345530183a146c123d87ca3a6fc6dc5820240b0212ed
 	sha256sums = a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b
-	sha256sums = cd840d3ad3a21517f30bb4979c97adaaccba2affdddaa5da2889f4fd2ba89578
+	sha256sums = 9079fd9ed7967479b7a78643d43537c04f9275303cd713651d2481bf4c658653
 	sha256sums = 546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd
 	sha256sums = c83beba543663b926d28d0eda98f1035cd73327da50f718a487763d300415a24
 	sha256sums = f438c7002eaf8e1186a838ac2e803242b7a2c98a22cf49622eb4a64cf4b202ec
 	sha256sums = 04c102d6db1bb8d4159c41f32ec0aa95846c0fb519841a3c1428ab20c850e9cf
 	sha256sums = 25c84d6823badf7c04dd316857b144b614a917943baeb8dc769b27cd029071ff
 	sha256sums = 498c21e2ab8ef8e789d5d99265678a2784e6d0ddbd407a520e107412fd8bfd0d
-	sha256sums = 03b2a29f146a0ff83fc263e149dce309665626e161328598411da97e0ebab104
+	sha256sums = e4166acb66ced33e9e2c3e7961d9581397e7016b8ed675341ed42fb9742dffe0
 	sha256sums = 69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3
 	sha256sums = 762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422
 	sha256sums = 47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a
diff --git a/PKGBUILD b/PKGBUILD
index 7bbcfa8f8cf7..a4e94d767982 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 #Maintainer: Gharim Turen <gharim@turen.de>
 pkgname=evesetup
 pkgver=1548102
-pkgrel=3
+pkgrel=4
 pkgdesc="An inofficial EVE Online Launcher Setup Tool."
 arch=(x86_64)
 url="https://forums.eveonline.com/t/eve-installing/71494"
@@ -103,19 +103,19 @@ package() {
 }
 
 sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4'
-            '892668cc9ceff769beba2d0b286566937de28ad4b1c245cba5cbb1113e74a4c9'
+            'e9c2145865e425a13fa38f433f2aec0574c44950442dffb900ae41085bfe7566'
             'b1faa042a96746fe80ea5d85a0c26e80b29353394897774f45b9e48e0639a1d8'
             '80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21'
-            '55490eb289afd5526a470d5df20cd1a97bb5b2b11c14defa3b36c7f354676237'
+            '893a749d7aff5ee1f5e9345530183a146c123d87ca3a6fc6dc5820240b0212ed'
             'a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b'
-            'cd840d3ad3a21517f30bb4979c97adaaccba2affdddaa5da2889f4fd2ba89578'
+            '9079fd9ed7967479b7a78643d43537c04f9275303cd713651d2481bf4c658653'
             '546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd'
             'c83beba543663b926d28d0eda98f1035cd73327da50f718a487763d300415a24'
             'f438c7002eaf8e1186a838ac2e803242b7a2c98a22cf49622eb4a64cf4b202ec'
             '04c102d6db1bb8d4159c41f32ec0aa95846c0fb519841a3c1428ab20c850e9cf'
             '25c84d6823badf7c04dd316857b144b614a917943baeb8dc769b27cd029071ff'
             '498c21e2ab8ef8e789d5d99265678a2784e6d0ddbd407a520e107412fd8bfd0d'
-            '03b2a29f146a0ff83fc263e149dce309665626e161328598411da97e0ebab104'
+            'e4166acb66ced33e9e2c3e7961d9581397e7016b8ed675341ed42fb9742dffe0'
             '69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3'
             '762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422'
             '47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a'
diff --git a/evelauncher.sh b/evelauncher.sh
index 90c944b7b5a3..5ce9707f43b7 100644
--- a/evelauncher.sh
+++ b/evelauncher.sh
@@ -3,7 +3,6 @@
 set -e
 
 ELVER=""
-QTVER="5.11"
 EVEDIR="$HOME/.local/lib/EVE"
 SETUPDIR=""
 LAUNCHER="$EVEDIR/Launcher"
diff --git a/evesetup.shlib b/evesetup.shlib
index 8966cd61ff81..c018d7439b2d 100644
--- a/evesetup.shlib
+++ b/evesetup.shlib
@@ -98,15 +98,17 @@ check_wine() {
 		$(which winetricks) -q --force $WINETRP >/dev/null
 	fi
     fi
-    if [ -x "$WINEPATH/wine64" ] ;then
-	WINE=$WINEPATH/wine64
-    else
-	WINE=$WINEPATH/wine
+    if [ "x$(grep -csw winemenubuilder $WINEPREFIX/system.reg)" != "x0" ] ;then
+	if [ -x "$WINEPATH/wine64" ] ;then
+	    WINE=$WINEPATH/wine64
+	else
+	    WINE=$WINEPATH/wine
+	fi
+	env WINEPREFIX=$WINEPREFIX \
+	    $WINE reg delete \
+	    'HKLM\Software\Microsoft\Windows\CurrentVersion\RunServices' \
+	    /v winemenubuilder /f >/dev/null
     fi
-    env WINEPREFIX=$WINEPREFIX \
-	$WINE reg delete \
-	'HKLM\Software\Microsoft\Windows\CurrentVersion\RunServices' \
-	/v winemenubuilder /f >/dev/null || true
 }
 
 desktop_msg() {
diff --git a/evewine b/evewine
index 2e23dcd1971b..889f39c2910e 100644
--- a/evewine
+++ b/evewine
@@ -4,10 +4,10 @@
 
 check_wine
 
-if [ -x "$WINEPATH/${0#*eve}" ] ;then
-    WINECMD=$WINEPATH/${0#*eve}
+if [ -x "$WINEPATH/${0##*eve}" ] ;then
+    WINECMD=$WINEPATH/${0##*eve}
 else
-    WINECMD=$CUSTOMWP\ ${0#*eve}
+    WINECMD=$CUSTOMWP\ ${0##*eve}
 fi
 
 env WINEPREFIX=$WINEPREFIX \
diff --git a/setup.sh.in b/setup.sh.in
index d16b6b799970..7ea2fb6ea8dc 100644
--- a/setup.sh.in
+++ b/setup.sh.in
@@ -98,6 +98,7 @@ build_lib() {
     find ./ -maxdepth 1 -type f -exec strip -s {} 2>/dev/null \;
     echo "done."
     printf "\nRepack evelauncher-$elver.tar.gz..."
+    touch ./*
     cd ../
     rm evelauncher-$elver.tar.gz
     tar czf evelauncher-$elver.tar.gz evelauncher/