License changed to zlib/png for compatibility to the used dxvk package.

Build script for independed installer (without evelauncher dependencies) added.
Minor changes on build script (with dependencies).
Removed some error message suppression in evesetup.shlib.
Use full file set of dxvk during wine environment setup in evesetup.shlib.

1 files changed, 15 insertions, 15 deletions

diff --git a/setup.sh.in b/setup.sh.in
index 66580de2ac70..8b7443cc3610 100644
--- a/setup.sh.in
+++ b/setup.sh.in
@@ -81,7 +81,7 @@ build_lib() {
 	printf "\nLeaving.\n\n"
 	exit 0
     fi
-    printf "\nExtract evelauncher-$elver.tar.gz..."
+    printf "\n\nExtract evelauncher-$elver.tar.gz..."
     tar xf evelauncher-$elver.tar.gz
     echo "done."
     printf "\nClean up evelauncher directory..."
@@ -135,28 +135,28 @@ get_dxvk() {
 
 check_req() {
     if [ -x "$(which 7z 2>/dev/null)" ] ;then
-	echo "$(7z | head -n2 | cut -d: -f1 | tr -d [:cntrl:])found."
+	printf "\n$(7z | head -n2 | cut -d: -f1 | tr -d [:cntrl:])found."
     else
-	echo "p7zip not found. Please install p7zip with your Package Manager."
-	printf "\nLeaving.\n\n"
-	exit 0
+	printf "\nError: 7z not found. 7z are needed by evebackup."
+	printf "\n\tPlease install p7zip or p7zip-full with your Package Manager.\n"
+	key="nf"
     fi
     if [ -x "$(which curl 2>/dev/null)" ] ;then
-	echo "Curl version $(curl -V | head -n1 | cut -d' ' -f2) found."
+	printf "\nCurl 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 "\nLeaving.\n\n"
-	exit 0
+	printf "\n\nError: Curl not found. Curl are needed for downloading evelauncher binaries."
+	printf "\n\tPlease install curl with your Package Manager.\n"
+	key="nf"
     fi
     if [ -x "$(which wine 2>/dev/null)" ] ;then
-	echo "Wine version $(wine --version) found."
+	printf "\nWine version $(wine --version) found."
     else
-	echo "Wine not found. Please install Wine with your Package Manager."
-	echo "WineHQ or Developer Version are recommended."
-	printf "\nLeaving.\n\n"
-	exit 0
+	printf "\n\nError: Wine not found."
+	printf "\n\tPlease install wine with your Package Manager."
+	printf "\n\tWineHQ or Developer Version are recommended.\n"
+	key="nf"
     fi
+    if [ "x$key" = "xnf" ] ;then printf "\n\nLeaving.\n\n" ;exit 0 ;fi
 }
 
 prefix="/usr"