Support for older wine versions less than 4.0 removed.

Info message for using internal wine version removed.
Using other registry setting to suppress winemenubuilder file associations.
Minor changes on internal test routines.

7 files changed, 31 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82be0aa89678..49b47d8c4882 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = evesetup
 	pkgdesc = An inofficial EVE Online Launcher Setup Tool.
 	pkgver = 1501045
-	pkgrel = 0
+	pkgrel = 1
 	url = https://forums.eveonline.com/t/eve-installing/71494
 	arch = x86_64
 	license = custom
@@ -51,18 +51,18 @@ 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-1501045.tar.gz
 	sha256sums = f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731
-	sha256sums = 42a63f594385b3ecb0272caa1819f64491a30725cb3c0e51dd5be6ad718a4585
-	sha256sums = 28af82100ab289e1761af26f10aae55c5644a496f0493dd08796b8b016405175
+	sha256sums = ffd9cd5d9089aaaa3ce97c875ff31317b0b37919da3bd73992685d98c7372e89
+	sha256sums = 2f2bc13df9e1a8bd6254519adfe538b527085710164e46d2874fd55d46dcffa8
 	sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21
-	sha256sums = bf09c4bd0b2735eba5868e47ae49707f257ff8a3d86c9da7c0411e5c93694b69
+	sha256sums = 32bd8115ce7563ed0c59eaf76f0ec4a8617934bf9a0fff42a285a1c4d0e38041
 	sha256sums = f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c
 	sha256sums = 459b74ad54268610e7e222407f2cb4efd2e9734e47c1c20c52f8f3c00034c623
 	sha256sums = 04d2a47524cbd132aad2fd310d56515a29310a2e693ba94ce12c65cd776a70d2
 	sha256sums = 22690e393ee89703b17898038aaa37900805104e8c960b346fe1f6050edc9bce
 	sha256sums = af9e68d643f0482259393eb326ccfbfe88c3084ebb120bb4c299abf6f6f58576
 	sha256sums = 2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d
-	sha256sums = dd21ced59bfd1d179cbce712abd6f2d607825bcc9dcac62d319ecaad51163aad
-	sha256sums = 5733c730adcaee8f93d5f659ed31135d327b4fe1ed0ee8d600a617a843aa4b56
+	sha256sums = e33dfe8c7b5ad020164f0cadd6c9b2a9483d9d5f92cdb45ec6a8cd670e1e89a4
+	sha256sums = 1afcf3ef5cdc3421c83a5d0579dd5e8f1b79b08e274cb34b4f6b732a9bb03521
 	sha256sums = 2c192fdc282fefafee5596b60bd1779668b611d386e2bf933eef51d39eac7a28
 	sha256sums = f88c7c28582b6531a021b8fcece47c906f900c48edf453dc04c349f8671cf8a2
 	sha256sums = 47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a
diff --git a/PKGBUILD b/PKGBUILD
index d6980014e178..1c8e7f4c0a25 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 #Maintainer: Gharim Turen <gharim@turen.de>
 pkgname=evesetup
 pkgver=1501045
-pkgrel=0
+pkgrel=1
 pkgdesc="An inofficial EVE Online Launcher Setup Tool."
 arch=(x86_64)
 url="https://forums.eveonline.com/t/eve-installing/71494"
@@ -105,18 +105,18 @@ package() {
 }
 
 sha256sums=('f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731'
-            '42a63f594385b3ecb0272caa1819f64491a30725cb3c0e51dd5be6ad718a4585'
-            '28af82100ab289e1761af26f10aae55c5644a496f0493dd08796b8b016405175'
+            'ffd9cd5d9089aaaa3ce97c875ff31317b0b37919da3bd73992685d98c7372e89'
+            '2f2bc13df9e1a8bd6254519adfe538b527085710164e46d2874fd55d46dcffa8'
             '80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21'
-            'bf09c4bd0b2735eba5868e47ae49707f257ff8a3d86c9da7c0411e5c93694b69'
+            '32bd8115ce7563ed0c59eaf76f0ec4a8617934bf9a0fff42a285a1c4d0e38041'
             'f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c'
             '459b74ad54268610e7e222407f2cb4efd2e9734e47c1c20c52f8f3c00034c623'
             '04d2a47524cbd132aad2fd310d56515a29310a2e693ba94ce12c65cd776a70d2'
             '22690e393ee89703b17898038aaa37900805104e8c960b346fe1f6050edc9bce'
             'af9e68d643f0482259393eb326ccfbfe88c3084ebb120bb4c299abf6f6f58576'
             '2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d'
-            'dd21ced59bfd1d179cbce712abd6f2d607825bcc9dcac62d319ecaad51163aad'
-            '5733c730adcaee8f93d5f659ed31135d327b4fe1ed0ee8d600a617a843aa4b56'
+            'e33dfe8c7b5ad020164f0cadd6c9b2a9483d9d5f92cdb45ec6a8cd670e1e89a4'
+            '1afcf3ef5cdc3421c83a5d0579dd5e8f1b79b08e274cb34b4f6b732a9bb03521'
             '2c192fdc282fefafee5596b60bd1779668b611d386e2bf933eef51d39eac7a28'
             'f88c7c28582b6531a021b8fcece47c906f900c48edf453dc04c349f8671cf8a2'
             '47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a'
diff --git a/build_installer.sh b/build_installer.sh
index 39775690e819..9cba7120ec51 100755
--- a/build_installer.sh
+++ b/build_installer.sh
@@ -44,7 +44,7 @@ cp -f ../evelauncher.shlib evesetup/evelauncher.shlib
 cp -f ../evelauncher.sh.in evesetup/evelauncher.sh
 grep -v '^#-' ../setup.sh.in >evesetup/setup.sh
 #-- testing only
-#-	cp -f ../setup.sh.in evesetup/setup.sh
+#- cp -f ../setup.sh.in evesetup/setup.sh
 #--
 chmod a+x evesetup/setup.sh
 echo "done."
diff --git a/evelauncher.sh b/evelauncher.sh
index ada0214d3689..5629446dcafb 100644
--- a/evelauncher.sh
+++ b/evelauncher.sh
@@ -43,29 +43,23 @@ check_wine() {
     WINEDATE=$(ls -l --time-style=+%s "$WINECONF" 2>/dev/null | cut -d' ' -f6)
     if [ "x$WINEDATE" != "x$INSTWINE" ] ;then
 	desktop_msg "Preparing wine in $WINEPREFIX"
+	rm -f $WINEPREFIX/.update-timestamp $WINEPREFIX/*.reg || true
+	rm -rf $WINEPREFIX/drive_c/Program* $WINEPREFIX/drive_c/windows || true
 	env WINEPREFIX=$WINEPREFIX \
 	    WINEDEBUG=-all \
 	    WINEDLLOVERRIDES="mscoree,mshtml,winemenubuilder.exe=d" \
 	    $WINEPATH/wine wineboot
-	env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg delete \
-	    'HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\RunServices' \
-	    /v winemenubuilder /f >/dev/null || true
-	    env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg add \
-	    'HKEY_CURRENT_USER\Software\Wine\DllOverrides' \
-	    /v winemenubuilder.exe /f >/dev/null
+	env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg add \
+	    'HKEY_CURRENT_USER\Software\Wine\FileOpenAssociations' \
+	    /v Enable /d N /f >/dev/null
 	WINETRP=$(grep -v win[x1..9] $WINEPREFIX/winetricks.log 2>/dev/null | uniq)
+	rm $WINEPREFIX/winetricks.log 2>/dev/null || true
 	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. ;echo $?)" != "x0" ] ;then
-	    WINVER=winxp
-	else
-	    WINVER=win10
-	fi
 	env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \
-	    $(which winetricks) -q --force $WINVER >/dev/null
+	    $(which winetricks) -q --force win10 >/dev/null
     fi
 }
 
diff --git a/evelauncher.sh.in b/evelauncher.sh.in
index 136c11ad93a8..6c6cad872f9f 100644
--- a/evelauncher.sh.in
+++ b/evelauncher.sh.in
@@ -53,30 +53,19 @@ 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
-        desktop_msg "Preparing wine in $WINEPREFIX"
-        env WINEPREFIX=$WINEPREFIX \
+	desktop_msg "Preparing wine in $WINEPREFIX"
+	env WINEPREFIX=$WINEPREFIX \
 	    WINEDEBUG=-all \
 	    WINEDLLOVERRIDES="mscoree,mshtml,winemenubuilder.exe=d" \
 	    $WINEPATH/wine wineboot
-	env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg delete \
-	    'HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\RunServices' \
-	    /v winemenubuilder /f >/dev/null || true
-	    env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg add \
-	    'HKEY_CURRENT_USER\Software\Wine\DllOverrides' \
-	    /v winemenubuilder.exe /f >/dev/null
 	WINETRP=$(grep -v win[x1..9] $WINEPREFIX/winetricks.log 2>/dev/null | uniq)
+	rm $WINEPREFIX/winetricks.log 2>/dev/null || true
 	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. ;echo $?)" != "x0" ] ;then
-	    WINVER=winxp
-	else
-	    WINVER=win10
-	fi
 	env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \
-	    $(which winetricks) -q --force $WINVER >/dev/null
+	    $(which winetricks) -q --force win10 >/dev/null
     fi
 }
 
diff --git a/evelauncher.shlib b/evelauncher.shlib
index 4adaee57ed3b..4a219170696c 100644
--- a/evelauncher.shlib
+++ b/evelauncher.shlib
@@ -18,12 +18,11 @@ check_custom_wine() {
     if [ "x$UCW" = "xtrue" ] ;then
 	WINEPATH=${CUSTOMWP%/*}
     else
-	desktop_msg "INFO: \"Use custom Wine\" not set, using internal version."
 	CUSTOMWP=${SHAREDIR}wine
 	WINEPATH=${SHAREDIR}wine/bin
     fi
     if [ ! -x "$WINEPATH/wine" ] ;then
-	desktop_msg "ERROR: \"$CUSTOMWP\" from \"Custom Wine path\" not found!"
+	desktop_msg "ERROR: \"$CUSTOMWP\" not found!"
 	exit 1
     fi
 }
diff --git a/setup.sh.in b/setup.sh.in
index fc56b43ea256..27135c548ac5 100644
--- a/setup.sh.in
+++ b/setup.sh.in
@@ -31,12 +31,12 @@ bootstrap_install() {
 	ln -s "${target}/bin/$cmd" "${prefix}/bin/$cmd"
 	if [ ! "$cmd" = "evewine" ] ;then
 #-- testing only
-#-	oexec=$(grep Exec= ./${cmd%.*}.desktop)
-#-	sed -i s,$oexec,Exec=$prefix/bin/$cmd, ./${cmd%.*}.desktop
+#- oexec=$(grep Exec= ./${cmd%.*}.desktop)
+#- sed -i s,$oexec,Exec=$prefix/bin/$cmd, ./${cmd%.*}.desktop
 #--
 	    install -m 0644 "./${cmd%.*}.desktop" "${prefix}/share/applications/"
 #-- testing only
-#-	sed -i s,Exec=$prefix/bin/$cmd,$oexec, ./${cmd%.*}.desktop
+#- sed -i s,Exec=$prefix/bin/$cmd,$oexec, ./${cmd%.*}.desktop
 #--
 	fi
     done
@@ -94,9 +94,8 @@ if [ -d "${target}/bin/" ] ;then
 	bootstrap_remove
 else
 #-- testing only
-#-	otarget=$(grep ^SETUPDIR= ./evelauncher.sh | tr -d \")
-#-	otarget=${otarget##*=}
-#-	sed -i s,$otarget,$target, ./evelauncher.sh ./evewine ./evewinetricks
+#- otarget=$(grep ^SETUPDIR= ./evelauncher.sh | tr -d \" | cut -d= -f2)
+#- sed -i s,$otarget,$target, ./evelauncher.sh ./evewine ./evewinetricks
 #--
     printf "\n"
     read -p 'Install EVE Online Launcher Setup? (Y/n) ' key
@@ -105,7 +104,7 @@ else
 	printf "\nYou can now start EVE Online Launcher and his " && \
 	echo "Tools from your Application menu."
 #-- testing only
-#-	sed -i s,$target,$otarget, ./evelauncher.sh ./evewine ./evewinetricks
+#- sed -i s,$target,$otarget, ./evelauncher.sh ./evewine ./evewinetricks
 #--
 fi
 printf "\nDone.\n\n"