Build script for independed installer changed. Launcher binaries are now

 downloaded on demand or integrated by building the installer. In both cases
 are the optimized launcher binaries build by installing the setup itself.
Checksum routines added for testing curl and makeself on demand.

4 files changed, 99 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f925b1a590fe..c70f559222a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = evesetup
 	pkgdesc = An inofficial EVE Online Launcher Setup Tool.
 	pkgver = 1501045
-	pkgrel = 1
+	pkgrel = 2
 	url = https://forums.eveonline.com/t/eve-installing/71494
 	arch = x86_64
 	license = custom
@@ -61,8 +61,8 @@ pkgbase = evesetup
 	sha256sums = 22690e393ee89703b17898038aaa37900805104e8c960b346fe1f6050edc9bce
 	sha256sums = af9e68d643f0482259393eb326ccfbfe88c3084ebb120bb4c299abf6f6f58576
 	sha256sums = 2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d
-	sha256sums = e33dfe8c7b5ad020164f0cadd6c9b2a9483d9d5f92cdb45ec6a8cd670e1e89a4
-	sha256sums = 1afcf3ef5cdc3421c83a5d0579dd5e8f1b79b08e274cb34b4f6b732a9bb03521
+	sha256sums = d635b65c6fad4eefab21b6933ab29755448dedf8e16a875787a704b851f43b7b
+	sha256sums = 446db863fff76fcd7c47e57b1a3ef87c1bcc92aac1642963ca3357f3c94f3207
 	sha256sums = 2c192fdc282fefafee5596b60bd1779668b611d386e2bf933eef51d39eac7a28
 	sha256sums = f88c7c28582b6531a021b8fcece47c906f900c48edf453dc04c349f8671cf8a2
 	sha256sums = 47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a
diff --git a/PKGBUILD b/PKGBUILD
index 951eafd6cc9b..ec4378457cca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 #Maintainer: Gharim Turen <gharim@turen.de>
 pkgname=evesetup
 pkgver=1501045
-pkgrel=1
+pkgrel=2
 pkgdesc="An inofficial EVE Online Launcher Setup Tool."
 arch=(x86_64)
 url="https://forums.eveonline.com/t/eve-installing/71494"
@@ -115,8 +115,8 @@ sha256sums=('f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731'
             '22690e393ee89703b17898038aaa37900805104e8c960b346fe1f6050edc9bce'
             'af9e68d643f0482259393eb326ccfbfe88c3084ebb120bb4c299abf6f6f58576'
             '2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d'
-            'e33dfe8c7b5ad020164f0cadd6c9b2a9483d9d5f92cdb45ec6a8cd670e1e89a4'
-            '1afcf3ef5cdc3421c83a5d0579dd5e8f1b79b08e274cb34b4f6b732a9bb03521'
+            'd635b65c6fad4eefab21b6933ab29755448dedf8e16a875787a704b851f43b7b'
+            '446db863fff76fcd7c47e57b1a3ef87c1bcc92aac1642963ca3357f3c94f3207'
             '2c192fdc282fefafee5596b60bd1779668b611d386e2bf933eef51d39eac7a28'
             'f88c7c28582b6531a021b8fcece47c906f900c48edf453dc04c349f8671cf8a2'
             '47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a'
diff --git a/build_installer.sh b/build_installer.sh
index 9cba7120ec51..a80a6ebe5d36 100755
--- a/build_installer.sh
+++ b/build_installer.sh
@@ -9,14 +9,24 @@ version=$(grep ^pkgver PKGBUILD | cut -d= -f2) || exit 1
 release=$(grep ^pkgrel PKGBUILD | cut -d= -f2) || exit 1
 arch=$(uname -m)
 
-if [ ! -f "makeself-2.4.0.run" ] ;then
-printf "\nGet makeself...\n\n"
+mscsum="ca66a6113ce98152b85c8d847949f8c90ab9ba798e106bfc225d4ed3c2e2e3e2"
+rcsum=""
+
+if [ ! -f "./makeself-2.4.0.run" ] ;then
+    if [ ! -x "$(which curl)" ] ;then
+	echo "Curl not found. Curl are needed for downloading makeself build tool."
+	echo " Please install curl with your Package Manager."
+	printf "\nExiting.\n\n"
+	exit 0
+    fi
+    printf "\nGet makeself...\n\n"
     curl -L -O https://github.com/megastep/makeself/releases/download/release-2.4.0/makeself-2.4.0.run
 fi
-
-if [ ! -f "evelauncher-$version.tar.gz" ] ;then
-printf "\nGet evelauncher-$version.tar.gz...\n\n"
-    curl -L -O https://binaries.eveonline.com/evelauncher-$version.tar.gz
+rcsum="$(sha256sum ./makeself-2.4.0.run| cut -d' ' -f1)"
+if [ "$rcsum" != "$mscsum" ] ;then
+    printf "\n\nError: Checksum from makeself-2.4.0.run doesn't match!"
+    printf "\nExiting.\n\n"
+    exit 0
 fi
 
 printf "\nCreate clean build environment..."
@@ -47,40 +57,7 @@ grep -v '^#-' ../setup.sh.in >evesetup/setup.sh
 #- cp -f ../setup.sh.in evesetup/setup.sh
 #--
 chmod a+x evesetup/setup.sh
-echo "done."
-
-printf "\nExtract evelauncher-$version.tar.gz..."
-tar xf ../evelauncher-$version.tar.gz
-echo "done."
-
-printf "\nClean up evelauncher directory..."
-cd evelauncher/
-rm -f ./*.a ./*.la ./*.prl
-chmod 0755 ./*
-chmod 0644 ./*.qm ./*.conf
-echo "done."
-
-printf "\nReplace identical files with symbolic links to the original file\n\n"
-ln -sfv evelauncher.sh LogLite.sh
-libb=/dev/zero
-for lib in $(find ./ -maxdepth 1 -type f -name 'lib*' -printf '%s-%f\n'|sort -r)
-do
-    liba=${lib#*-}
-    if [ "$(cmp -s $liba $libb; echo $?)" = "0" ] ;then
-        ln -sfv $libb $liba
-    else
-        libb=$liba
-    fi
-done
-
-printf "\nRemove unneeded symbols from files..."
-find ./ -maxdepth 1 -type f -exec strip -s {} 2>/dev/null \;
-echo "done."
-
-printf "\nRepack evelauncher-$version.tar.gz..."
-cd ../
-tar czf evesetup/evelauncher-$version.tar.gz evelauncher/
-rm -rf evelauncher/
+if [ -f "../evelauncher-$version.tar.gz" ] ;then cp ../evelauncher-$version.tar.gz evesetup/ ;fi
 echo "done."
 
 printf "\nBuild self-extractable archive evesetup-$version-$release-$arch.run\n\n"
diff --git a/setup.sh.in b/setup.sh.in
index 27135c548ac5..e45e6222aa4f 100644
--- a/setup.sh.in
+++ b/setup.sh.in
@@ -3,22 +3,6 @@
 set -e
 
 bootstrap_install() {
-    if [ -x "$(which wine)" ] ;then
-	echo "Wine version $(wine --version) found."
-    else
-	echo "Wine not found. Please install Wine with your Package Manager."
-	echo "WineHQ or Developer Version are recommended."
-	printf "\nExiting.\n\n"
-	exit 0
-    fi
-    if [ -x "$(which winetricks)" ] ;then
-	echo "Winetricks version $(winetricks --version | cut -d' ' -f1) found."
-    else
-	echo "Winetricks not found. Winetricks are required."
-	echo " Please install Winetricks with your Package Manager."
-	printf "\nExiting.\n\n"
-	exit 0
-    fi
     install -dv "${target}/bin/"
     install -d "${prefix}/bin/"
     install -d "${prefix}/share/applications/"
@@ -75,11 +59,84 @@ bootstrap_remove() {
     rm -rfv "${target}"
 }
 
+build_lib() {
+    if [ ! -r "./evelauncher-$elver.tar.gz" ] ;then
+	if [ -x "$(which curl 2>/dev/null)" ] ;then
+	    echo "Curl version $(curl -V | head -n1 | cut -d' ' -f2) found."
+	else
+	    echo "Curl not found. Curl are needed for downloading evelauncher binaries."
+	    echo " Please install curl with your Package Manager."
+	    printf "\nExiting.\n\n"
+	    exit 0
+	fi
+    printf "\nDownloading evelauncher-$elver.tar.gz...\n\n"
+	curl -L -O https://binaries.eveonline.com/evelauncher-$elver.tar.gz
+    fi
+    rcsum="$(sha256sum ./evelauncher-$elver.tar.gz| cut -d' ' -f1)"
+    if [ "$rcsum" != "$elcsum" ] ;then
+	printf "\n\nError: Checksum from evelauncher-$elver.tar.gz doesn't match!"
+	printf "\nExiting.\n\n"
+	exit 0
+    fi
+    printf "\nExtract evelauncher-$elver.tar.gz..."
+    tar xf evelauncher-$elver.tar.gz
+    echo "done."
+    printf "\nClean up evelauncher directory..."
+    cd evelauncher/
+    rm -f ./*.a ./*.la ./*.prl
+    chmod 0755 ./*
+    chmod 0644 ./*.qm ./*.conf
+    echo "done."
+    printf "\nReplace identical files with symbolic links..."
+    ln -sf evelauncher.sh LogLite.sh
+    libb=/dev/zero
+    for lib in $(find ./ -maxdepth 1 -type f -name 'lib*' -printf '%s-%f\n'|sort -r)
+    do
+	liba=${lib#*-}
+	if [ "$(cmp -s $liba $libb; echo $?)" = "0" ] ;then
+	    ln -sf $libb $liba
+	else
+	    libb=$liba
+	fi
+    done
+    echo "done."
+    printf "\nRemove unneeded symbols from files..."
+    find ./ -maxdepth 1 -type f -exec strip -s {} 2>/dev/null \;
+    echo "done."
+    printf "\nRepack evelauncher-$elver.tar.gz..."
+    cd ../
+    rm evelauncher-$elver.tar.gz
+    tar czf evelauncher-$elver.tar.gz evelauncher/
+    rm -rf evelauncher/
+    echo "done."
+}
+
+check_req() {
+    if [ -x "$(which wine 2>/dev/null)" ] ;then
+	echo "Wine version $(wine --version) found."
+    else
+	echo "Wine not found. Please install Wine with your Package Manager."
+	echo "WineHQ or Developer Version are recommended."
+	printf "\nExiting.\n\n"
+	exit 0
+    fi
+    if [ -x "$(which winetricks 2>/dev/null)" ] ;then
+	echo "Winetricks version $(winetricks --version | cut -d' ' -f1) found."
+    else
+	echo "Winetricks not found. Winetricks are required."
+	echo " Please install Winetricks with your Package Manager."
+	printf "\nExiting.\n\n"
+	exit 0
+    fi
+}
+
 target="/opt/evesetup"
 prefix="/usr"
 key=""
 qtver="5.11"
 elver="1501045"
+elcsum="08b5dbb25c92ffe3c27e27a5353db7096b92a0a093c73e99e7fe08e2d4831ba0"
+rcsum=""
 
 if [ $(id -u) -ne 0 ] ;then
     printf "\nEVE Online Launcher Setup need root permissions."
@@ -100,6 +157,9 @@ else
     printf "\n"
     read -p 'Install EVE Online Launcher Setup? (Y/n) ' key
     [ ! "x$(echo $key | tr [:upper:] [:lower:])" = "xn" ] && \
+	check_req && \
+	build_lib && \
+	printf "\nInstalling...\n\n"
 	bootstrap_install && \
 	printf "\nYou can now start EVE Online Launcher and his " && \
 	echo "Tools from your Application menu."