In build scripts checksum routine added and minor changes.

Enabled DX11 mode as default in evesetup.shlib in eve environment function.

8 files changed, 70 insertions, 107 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6bf1b3937649..f3df8521ea84 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -30,7 +30,6 @@ pkgbase = evesetup
 	noextract = eve-transl5.12-ko.tar.gz
 	noextract = eve-transl5.12-ru.tar.gz
 	noextract = eve-transl5.12-zh.tar.gz
-	noextract = https://github.com/megastep/makeself/releases/download/release-2.4.0/makeself-2.4.0.run
 	source = evelauncher.desktop
 	source = evelauncher.sh
 	source = evelauncher.sh.in
@@ -65,19 +64,19 @@ pkgbase = evesetup
 	sha256sums = 29b6f2cda542c8f3f3845fb3e1ff3e9ac2a645d389c1618bdac5fa69947a2b4b
 	sha256sums = 77b8a8d1cde800956dadf8abf35287c34b3c844c40dfa8f89ed01ca2cde345fb
 	sha256sums = 168478fca0bc7be5be3ed2a44e3b64732d2b0ef0758f7d9bd51ec56b7e0713eb
-	sha256sums = fdb777d7f728681055f2038c9b04d153a131086665ca189814b013655465fc22
+	sha256sums = d848170b21f6c2a7ae04139a209bf5806b95a18ac90dbbf5bf6cc3e96204b2e1
 	sha256sums = a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b
-	sha256sums = 66dd912ceb3073e6e210d7addc7d284fb5bdf2b746ac723c8b57ead19ffe75b4
+	sha256sums = 94679e947e7ecaa5f2b1da96b53d92e74aa45c19aab1f6d2fc7d28d3fea3ac1d
 	sha256sums = 546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd
 	sha256sums = c83beba543663b926d28d0eda98f1035cd73327da50f718a487763d300415a24
-	sha256sums = 355e2d287c77ec4313792548b66de8a751e1f8489b2bf9e734ce6b967c6a36d5
+	sha256sums = 68a0f72b795a062b118745ae29f377863111e893f6536cd1a6cc7e633f3a1b29
 	sha256sums = 30b6440b842c19df64892cc560c274a7cc4f5de910a9f81e12dd0d76da561474
 	sha256sums = ebdeaa2a143b8d247d94b4a57a45065c299253c074f5d741870a78dd384c29f0
 	sha256sums = 261da84107168979d241c60cd7adbfee0f6675464675faaefd5f6140009d54d8
 	sha256sums = 609c021ee09ced450b1aeda9c3dd586ebfbc17d2bdccbb4be69de70d661d12c8
 	sha256sums = c53c6f09a0d2d12a4360bc4283d6259de1f47cfc29f708fdd9b960aab30af4ef
-	sha256sums = 5b77ced59ea81a4d4caf2e0f3a30beeab6f0ca584af1f7b297f99043a01b3773
-	sha256sums = d1364de23e651e2f187d53e9064d76d8d69b63dc9eaba9e65c99964cb39cecd9
+	sha256sums = c9276c42973b1b7cfa851ef9109a40c70ca5d4ec918fd20fb9dfc90cb02c7b60
+	sha256sums = 565cb6803fd6802233e6329aae1742413034222df9d6d3add6334f26cecc4439
 	sha256sums = 60b6f5175916c40ed355ef29fb637743227a2b25c446a9239df69d320f2667fa
 	sha256sums = 4e9083c96ada9c607b12fc1be77db595a6932d01d7c6b224a3c546aa98f37b32
 	sha256sums = 69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3
diff --git a/PKGBUILD b/PKGBUILD
index 750e4a017682..15f80c31adde 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -62,8 +62,7 @@ noextract=('eve-transl5.12-de.tar.gz'
            'eve-transl5.12-fr.tar.gz'
            'eve-transl5.12-ko.tar.gz'
            'eve-transl5.12-ru.tar.gz'
-           'eve-transl5.12-zh.tar.gz'
-           'https://github.com/megastep/makeself/releases/download/release-2.4.0/makeself-2.4.0.run')
+           'eve-transl5.12-zh.tar.gz')
 
 package() {
         install -d "${pkgdir}/opt/${pkgname}/bin"
@@ -129,19 +128,19 @@ sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4'
             '29b6f2cda542c8f3f3845fb3e1ff3e9ac2a645d389c1618bdac5fa69947a2b4b'
             '77b8a8d1cde800956dadf8abf35287c34b3c844c40dfa8f89ed01ca2cde345fb'
             '168478fca0bc7be5be3ed2a44e3b64732d2b0ef0758f7d9bd51ec56b7e0713eb'
-            'fdb777d7f728681055f2038c9b04d153a131086665ca189814b013655465fc22'
+            'd848170b21f6c2a7ae04139a209bf5806b95a18ac90dbbf5bf6cc3e96204b2e1'
             'a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b'
-            '66dd912ceb3073e6e210d7addc7d284fb5bdf2b746ac723c8b57ead19ffe75b4'
+            '94679e947e7ecaa5f2b1da96b53d92e74aa45c19aab1f6d2fc7d28d3fea3ac1d'
             '546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd'
             'c83beba543663b926d28d0eda98f1035cd73327da50f718a487763d300415a24'
-            '355e2d287c77ec4313792548b66de8a751e1f8489b2bf9e734ce6b967c6a36d5'
+            '68a0f72b795a062b118745ae29f377863111e893f6536cd1a6cc7e633f3a1b29'
             '30b6440b842c19df64892cc560c274a7cc4f5de910a9f81e12dd0d76da561474'
             'ebdeaa2a143b8d247d94b4a57a45065c299253c074f5d741870a78dd384c29f0'
             '261da84107168979d241c60cd7adbfee0f6675464675faaefd5f6140009d54d8'
             '609c021ee09ced450b1aeda9c3dd586ebfbc17d2bdccbb4be69de70d661d12c8'
             'c53c6f09a0d2d12a4360bc4283d6259de1f47cfc29f708fdd9b960aab30af4ef'
-            '5b77ced59ea81a4d4caf2e0f3a30beeab6f0ca584af1f7b297f99043a01b3773'
-            'd1364de23e651e2f187d53e9064d76d8d69b63dc9eaba9e65c99964cb39cecd9'
+            'c9276c42973b1b7cfa851ef9109a40c70ca5d4ec918fd20fb9dfc90cb02c7b60'
+            '565cb6803fd6802233e6329aae1742413034222df9d6d3add6334f26cecc4439'
             '60b6f5175916c40ed355ef29fb637743227a2b25c446a9239df69d320f2667fa'
             '4e9083c96ada9c607b12fc1be77db595a6932d01d7c6b224a3c546aa98f37b32'
             '69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3'
diff --git a/build_installer.sh b/build_installer.sh
index eb13b98621ee..4ecc91cc32af 100755
--- a/build_installer.sh
+++ b/build_installer.sh
@@ -2,40 +2,27 @@
 
 set -e
 
-printf "\n\n Buildscript for the distribution independed installer of"
-printf " EVE Online Launcher Setup\n\n"
+printf "\n\n Build installer for EVE Online Setup\n\n"
 
 version=$(grep ^pkgver PKGBUILD | cut -d= -f2) || exit 1
 release=$(grep ^pkgrel PKGBUILD | cut -d= -f2) || exit 1
 arch=$(uname -m)
 
-dvver=$(grep doitsujin PKGBUILD | cut -d\" -f2 | sed 's,.*-,,;s,.tar.*,,' )
-dvcsum=""
-elcsum=""
-mscsum="ca66a6113ce98152b85c8d847949f8c90ab9ba798e106bfc225d4ed3c2e2e3e2"
-rcsum=""
+csum() {
+	sha=$(grep -n ^sha256sum PKGBUILD | cut -d: -f1)
+	src=$(grep -n ^source PKGBUILD | cut -d: -f1)
+	sln=$(grep -n $1\" PKGBUILD | cut -d: -f1)
+	ofs=$(expr $sln - $src)
+	cln=$(expr $sha + $ofs)
+	printf $(tail -n+$cln PKGBUILD | head -n1 | tr -cd '[:alnum:]')
+}
 
-pshal=$(grep -n ^sha256sum PKGBUILD | cut -d: -f1)
-psrcl=$(grep -n ^source PKGBUILD | cut -d: -f1)
-pdvsl=$(grep -n dxvk-$dvver.tar.gz\" PKGBUILD | cut -d: -f1)
-pelsl=$(grep -n evelauncher-\${pkgver}.tar.gz\" PKGBUILD | cut -d: -f1)
-pdfsl=$(expr $pdvsl - $psrcl)
-pofsl=$(expr $pelsl - $psrcl)
-pdvcs=$(expr $pshal + $pdfsl)
-pelcs=$(expr $pshal + $pofsl)
+dvver=$(grep doitsujin PKGBUILD | sed 's,.*-,,;s,.tar.*,,' )
+msver=$(grep makeself PKGBUILD | sed 's,.*-,,;s,.run.*,,' )
 
-plc=1
-while read pline ;do
-	if [ $plc -eq $pdvcs ] ;then
-		dvcsum=${pline#*\'}
-		dvcsum=${dvcsum%%\'*}
-	fi
-	if [ $plc -eq $pelcs ] ;then
-		elcsum=${pline#*\'}
-		elcsum=${elcsum%%\'*}
-	fi
-	plc=$(expr $plc + 1)
-done < PKGBUILD
+dvcsum=$(csum dxvk-$dvver.tar.gz)
+elcsum=$(csum evelauncher-\${pkgver}.tar.gz)
+mscsum=$(csum makeself-$msver.run)
 
 if [ ! -x "$(which curl 2>/dev/null)" ] ;then
 	printf "\nError: Curl not found. Curl are needed for downloading makeself build tool."
@@ -44,13 +31,13 @@ if [ ! -x "$(which curl 2>/dev/null)" ] ;then
 	exit 0
 fi
 
-if [ ! -f "./makeself-2.4.0.run" ] ;then
+if [ ! -f "./makeself-$msver.run" ] ;then
 	printf "\nGet makeself...\n\n"
-	curl -L -O https://github.com/megastep/makeself/releases/download/release-2.4.0/makeself-2.4.0.run
+	curl -L -O https://github.com/megastep/makeself/releases/download/release-$msver/makeself-$msver.run
 fi
-rcsum="$(sha256sum ./makeself-2.4.0.run | cut -d' ' -f1)"
+rcsum="$(sha256sum ./makeself-$msver.run | cut -d' ' -f1)"
 if [ "$rcsum" != "$mscsum" ] ;then
-	printf "\n\nError: Checksum makeself-2.4.0.run mismatch!"
+	printf "\n\nError: Checksum makeself-$msver.run mismatch!"
 	printf "\nLeaving.\n\n"
 	exit 0
 fi
@@ -58,9 +45,9 @@ fi
 printf "\nCreate clean build environment..."
 if [ -d src/ ] ;then rm -rf src/* ;else mkdir src/ ;fi
 
-chmod a+x ./makeself-2.4.0.run
-./makeself-2.4.0.run --tar x ./makeself.sh ./makeself-header.sh 2>/dev/null
-chmod a-x ./makeself-2.4.0.run
+chmod a+x ./makeself-$msver.run
+./makeself-$msver.run --tar x ./makeself.sh ./makeself-header.sh 2>/dev/null
+chmod a-x ./makeself-$msver.run
 mv ./makeself.sh ./makeself-header.sh src/
 
 cd src/
@@ -113,7 +100,7 @@ if [ -f "../dxvk-$dvver.tar.gz" ] ;then
 else
 	printf "\nDXVK archive not found, will be downloaded during the setup process.\n"
 fi
-printf "\nBuild self-extractable archive evesetup-$version-$release-$arch.run\n\n"
+printf "\nCreate self-extractable archive evesetup-$version-$release-$arch.run\n\n"
 ./makeself.sh --tar-quietly evesetup/ ../evesetup-$version-$release-$arch.run \
 	"EVE Online Launcher Setup $version-$release" ./setup.sh
 cd ..
diff --git a/build_lite_installer.sh b/build_lite_installer.sh
index 350f7c2f44ac..8479f652cd25 100755
--- a/build_lite_installer.sh
+++ b/build_lite_installer.sh
@@ -2,40 +2,27 @@
 
 set -e
 
-printf "\n\n Buildscript for the distribution independed installer of"
-printf " EVE Online Launcher Setup (Lite)\n\n"
+printf "\n\n Build installer for EVE Online Setup (Lite Version)\n\n"
 
 version=$(grep ^pkgver PKGBUILD | cut -d= -f2) || exit 1
 release=$(grep ^pkgrel PKGBUILD | cut -d= -f2) || exit 1
 arch=$(uname -m)
 
-dvver=$(grep doitsujin PKGBUILD | cut -d\" -f2 | sed 's,.*-,,;s,.tar.*,,' )
-dvcsum=""
-elcsum=""
-mscsum="ca66a6113ce98152b85c8d847949f8c90ab9ba798e106bfc225d4ed3c2e2e3e2"
-rcsum=""
-
-pshal=$(grep -n ^sha256sum PKGBUILD | cut -d: -f1)
-psrcl=$(grep -n ^source PKGBUILD | cut -d: -f1)
-pdvsl=$(grep -n dxvk-$dvver.tar.gz\" PKGBUILD | cut -d: -f1)
-pelsl=$(grep -n evelauncher-\${pkgver}.tar.gz\" PKGBUILD | cut -d: -f1)
-pdfsl=$(expr $pdvsl - $psrcl)
-pofsl=$(expr $pelsl - $psrcl)
-pdvcs=$(expr $pshal + $pdfsl)
-pelcs=$(expr $pshal + $pofsl)
-
-plc=1
-while read pline ;do
-	if [ $plc -eq $pdvcs ] ;then
-		dvcsum=${pline#*\'}
-		dvcsum=${dvcsum%%\'*}
-	fi
-	if [ $plc -eq $pelcs ] ;then
-		elcsum=${pline#*\'}
-		elcsum=${elcsum%%\'*}
-	fi
-	plc=$(expr $plc + 1)
-done < PKGBUILD
+csum() {
+	sha=$(grep -n ^sha256sum PKGBUILD | cut -d: -f1)
+	src=$(grep -n ^source PKGBUILD | cut -d: -f1)
+	sln=$(grep -n $1\" PKGBUILD | cut -d: -f1)
+	ofs=$(expr $sln - $src)
+	cln=$(expr $sha + $ofs)
+	printf $(tail -n+$cln PKGBUILD | head -n1 | tr -cd '[:alnum:]')
+}
+
+dvver=$(grep doitsujin PKGBUILD | sed 's,.*-,,;s,.tar.*,,' )
+msver=$(grep makeself PKGBUILD | sed 's,.*-,,;s,.run.*,,' )
+
+dvcsum=$(csum dxvk-$dvver.tar.gz)
+elcsum=$(csum evelauncher-\${pkgver}.tar.gz)
+mscsum=$(csum makeself-$msver.run)
 
 if [ ! -x "$(which curl 2>/dev/null)" ] ;then
 	printf "\nError: Curl not found. Curl are needed for downloading makeself build tool."
@@ -44,13 +31,13 @@ if [ ! -x "$(which curl 2>/dev/null)" ] ;then
 	exit 0
 fi
 
-if [ ! -f "./makeself-2.4.0.run" ] ;then
+if [ ! -f "./makeself-$msver.run" ] ;then
 	printf "\nGet makeself...\n\n"
-	curl -L -O https://github.com/megastep/makeself/releases/download/release-2.4.0/makeself-2.4.0.run
+	curl -L -O https://github.com/megastep/makeself/releases/download/release-$msver/makeself-$msver.run
 fi
-rcsum="$(sha256sum ./makeself-2.4.0.run | cut -d' ' -f1)"
+rcsum="$(sha256sum ./makeself-$msver.run | cut -d' ' -f1)"
 if [ "$rcsum" != "$mscsum" ] ;then
-	printf "\n\nError: Checksum makeself-2.4.0.run mismatch!"
+	printf "\n\nError: Checksum makeself-$msver.run mismatch!"
 	printf "\nLeaving.\n\n"
 	exit 0
 fi
@@ -79,9 +66,9 @@ fi
 printf "\nCreate clean build environment..."
 if [ -d src/ ] ;then rm -rf src/* ;else mkdir src/ ;fi
 
-chmod a+x ./makeself-2.4.0.run
-./makeself-2.4.0.run --tar x ./makeself.sh ./makeself-header.sh 2>/dev/null
-chmod a-x ./makeself-2.4.0.run
+chmod a+x ./makeself-$msver.run
+./makeself-$msver.run --tar x ./makeself.sh ./makeself-header.sh 2>/dev/null
+chmod a-x ./makeself-$msver.run
 mv ./makeself.sh ./makeself-header.sh src/
 
 cd src/
diff --git a/evesetup.changelog b/evesetup.changelog
index c0eb27a892f5..a3cdd675aa0a 100644
--- a/evesetup.changelog
+++ b/evesetup.changelog
@@ -1 +1,6 @@
-Temporary fix to terminate hanging evelauncher binary in all setup variants added.
+In build scripts checksum routine added and minor changes.
+Enabled DX11 mode as default in evesetup.shlib in eve environment function.
+
+
+
+
diff --git a/evesetup.shlib b/evesetup.shlib
index 41535cd82cba..c2e44527adab 100644
--- a/evesetup.shlib
+++ b/evesetup.shlib
@@ -36,6 +36,7 @@ check_env() {
 SharedCacheFolder=$EVEDIR/SharedCache/
 UseCustomWine=true
 CustomWinePath=$WINEPATH/wine
+LauncherRunClientsWithDx9=false
 EOF
 		mkdir -p $EVEDIR/SharedCache
 		if [ -d "$SHAREDIR/ResFiles/" ] ;then
@@ -47,7 +48,7 @@ EOF
 }
 
 check_steam() {
-	if [ ! -r "$LAUNCHER/steam_appid.txt" -a -x "$(which steam)" ] ;then
+	if [ ! -r "$LAUNCHER/steam_appid.txt" -a -x "$(which steam 2>/dev/null)" ] ;then
 		echo "8500" >$LAUNCHER/steam_appid.txt
 	fi
 }
@@ -85,14 +86,8 @@ check_wine() {
 				rm $W32SYSDIR/$DXVKFILE.dll* || true
 				sed -i /\"$DXVKFILE\"=\"/d $WINEPREFIX/user.reg || true
 			done
-			env WINEPREFIX=$WINEPREFIX \
-				WINEDEBUG=-all \
-				WINEDLLOVERRIDES="mscoree,mshtml=d" \
-				$WINE wineboot
-			env WINEPREFIX=$WINEPREFIX \
-				$WINE reg add \
-				'HKCU\Software\Wine\FileOpenAssociations' \
-				/v Enable /d N /f >/dev/null
+			env WINEPREFIX=$WINEPREFIX WINEDEBUG=-all WINEDLLOVERRIDES="mscoree,mshtml=d" $WINE wineboot
+			env WINEPREFIX=$WINEPREFIX $WINE reg add 'HKCU\Software\Wine\FileOpenAssociations' /v Enable /d N /f >/dev/null
 		fi
 		if [ -d "$DXVKLIBDIR" ] ;then
 			DXVKARC=$(getdate $DXVKLIBDIR/x64/d3d10core.dll)
@@ -103,18 +98,12 @@ check_wine() {
 					if [ -d "$W32SYSDIR" ] ;then
 						cp --preserve=timestamps $DXVKLIBDIR/x32/$DXVKFILE.dll $W32SYSDIR/$DXVKFILE.dll
 					fi
-					env WINEPREFIX=$WINEPREFIX \
-						$WINE reg add \
-						'HKCU\Software\Wine\DllOverrides' \
-						/v $DXVKFILE /d native /f >/dev/null
+					env WINEPREFIX=$WINEPREFIX $WINE reg add 'HKCU\Software\Wine\DllOverrides' /v $DXVKFILE /d native /f >/dev/null
 				done
 			fi
 		fi
 		if [ "$(grep -csw winemenubuilder $WINEPREFIX/system.reg)" != "0" ] ;then
-			env WINEPREFIX=$WINEPREFIX \
-				$WINE reg delete \
-				'HKLM\Software\Microsoft\Windows\CurrentVersion\RunServices' \
-				/v winemenubuilder /f >/dev/null
+			env WINEPREFIX=$WINEPREFIX $WINE reg delete 'HKLM\Software\Microsoft\Windows\CurrentVersion\RunServices' /v winemenubuilder /f >/dev/null
 		fi
 	fi
 }
diff --git a/evewine b/evewine
index cecf23e95acf..e82d303cdfb8 100644
--- a/evewine
+++ b/evewine
@@ -12,6 +12,4 @@ else
 	WINECMD=$CUSTOMWP\ ${0##*eve}
 fi
 
-env WINEPREFIX=$WINEPREFIX \
-	WINEDEBUG=-all \
-	$WINECMD "$@"
+env WINEPREFIX=$WINEPREFIX WINEDEBUG=-all $WINECMD "$@"
diff --git a/evewinetricks b/evewinetricks
index 564b311504a2..5696cc311c4b 100644
--- a/evewinetricks
+++ b/evewinetricks
@@ -13,5 +13,4 @@ if [ "x$WINETRICKS" = "x"  ] ;then
 	exit 1
 fi
 
-env WINEPREFIX=$WINEPREFIX \
-	WINE=$WINEPATH/wine $WINETRICKS "$@"
+env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine $WINETRICKS "$@"