Fixed a bug which prevent since version 1539902 the creation of a new EVE environment.

5 files changed, 13 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 00aa525739e0..6acb27493d88 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = evesetup
 	pkgdesc = An inofficial EVE Online Launcher Setup Tool.
 	pkgver = 1548102
-	pkgrel = 0
+	pkgrel = 1
 	url = https://forums.eveonline.com/t/eve-installing/71494
 	arch = x86_64
 	license = custom
@@ -53,8 +53,8 @@ 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 = b5febef1a55d27af357f88079c0c7a1799971bd570080d91034115230323ef68
-	sha256sums = e0b2105d58713a71940ae4443f8e4526505fb7db18515897ebbf3e2fd3641992
+	sha256sums = 351dff8575fe846da69226c9c3ac462917a17c87684b0c4f145bf23aa93934ef
+	sha256sums = c2c8f7ff36b0b8aa8290054697138c846b4810760fe9eddff6bd97514b7933eb
 	sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21
 	sha256sums = c3849fd2277cedaacbb68805b7667d3980d763e0f1cc80050628bb42b0e0d380
 	sha256sums = a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b
@@ -66,7 +66,7 @@ pkgbase = evesetup
 	sha256sums = 25c84d6823badf7c04dd316857b144b614a917943baeb8dc769b27cd029071ff
 	sha256sums = 2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d
 	sha256sums = 498c21e2ab8ef8e789d5d99265678a2784e6d0ddbd407a520e107412fd8bfd0d
-	sha256sums = 11aa040bc38c34bb5ad516813a5879a18a81991f067c8e64a18971d2f4196aa6
+	sha256sums = 70a9f99442527fbefa9767582e20232b7c7f5241fd635a036d3beac746e61733
 	sha256sums = 69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3
 	sha256sums = 762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422
 	sha256sums = 47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a
diff --git a/PKGBUILD b/PKGBUILD
index c03768c90355..3c4c515fcfbf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 #Maintainer: Gharim Turen <gharim@turen.de>
 pkgname=evesetup
 pkgver=1548102
-pkgrel=0
+pkgrel=1
 pkgdesc="An inofficial EVE Online Launcher Setup Tool."
 arch=(x86_64)
 url="https://forums.eveonline.com/t/eve-installing/71494"
@@ -64,6 +64,8 @@ package() {
         install -d "${pkgdir}/usr/bin"
         install -d "${pkgdir}/usr/share/applications"
         install -d "${pkgdir}/usr/share/icons"
+        sed -i s,ELVER=\"\",ELVER=\"${pkgver}\", "${srcdir}/evelauncher.sh"
+        sed -i s,SETUPDIR=\"\",SETUPDIR=\"/opt/${pkgname}\", "${srcdir}/evelauncher.sh"
         for cmd in evelauncher.sh everegedit evewine evewinecfg evewinetricks evebackup ;do
             if [ -f "${srcdir}/$cmd" ] ;then
                 sed -i s,./evesetup.shlib,/opt/${pkgname}/lib/evesetup.shlib, "${srcdir}/$cmd"
@@ -78,7 +80,6 @@ package() {
                 cp "${srcdir}/${cmd%.*}.desktop" "${pkgdir}/usr/share/applications/"
             fi
         done
-        sed -i s,ELVER=\"\",ELVER=\"${pkgver}\", "${pkgdir}/opt/${pkgname}/bin/evelauncher.sh"
         cp ${srcdir}/evesetup.shlib ${pkgdir}/opt/${pkgname}/lib
         cp -r ${srcdir}/icons ${pkgdir}/usr/share/
         rm -rf ${srcdir}/evelauncher/resources/ ${srcdir}/evelauncher/plugins/
@@ -104,8 +105,8 @@ package() {
 }
 
 sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4'
-            'b5febef1a55d27af357f88079c0c7a1799971bd570080d91034115230323ef68'
-            'e0b2105d58713a71940ae4443f8e4526505fb7db18515897ebbf3e2fd3641992'
+            '351dff8575fe846da69226c9c3ac462917a17c87684b0c4f145bf23aa93934ef'
+            'c2c8f7ff36b0b8aa8290054697138c846b4810760fe9eddff6bd97514b7933eb'
             '80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21'
             'c3849fd2277cedaacbb68805b7667d3980d763e0f1cc80050628bb42b0e0d380'
             'a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b'
@@ -117,7 +118,7 @@ sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4'
             '25c84d6823badf7c04dd316857b144b614a917943baeb8dc769b27cd029071ff'
             '2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d'
             '498c21e2ab8ef8e789d5d99265678a2784e6d0ddbd407a520e107412fd8bfd0d'
-            '11aa040bc38c34bb5ad516813a5879a18a81991f067c8e64a18971d2f4196aa6'
+            '70a9f99442527fbefa9767582e20232b7c7f5241fd635a036d3beac746e61733'
             '69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3'
             '762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422'
             '47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a'
diff --git a/evelauncher.sh b/evelauncher.sh
index fd3bf7cb0bfe..bc046edfd048 100644
--- a/evelauncher.sh
+++ b/evelauncher.sh
@@ -5,6 +5,7 @@ set -e
 ELVER=""
 QTVER="5.11"
 EVEDIR="$HOME/.local/lib/EVE"
+SETUPDIR=""
 LAUNCHER="$EVEDIR/Launcher"
 WINEPATH="/usr/bin"
 
diff --git a/evelauncher.sh.in b/evelauncher.sh.in
index 07025430cce8..412442d6fcba 100644
--- a/evelauncher.sh.in
+++ b/evelauncher.sh.in
@@ -5,6 +5,7 @@ set -e
 ELVER=""
 QTVER="5.11"
 EVEDIR="$HOME/.local/lib/EVE"
+SETUPDIR=""
 LAUNCHER="$EVEDIR/Launcher"
 WINEPATH="/usr/bin"
 
diff --git a/setup.sh.in b/setup.sh.in
index 63c203f9b2d0..372b43481f34 100644
--- a/setup.sh.in
+++ b/setup.sh.in
@@ -14,6 +14,7 @@ bootstrap_install() {
     install -m 0644 "./evesetup.shlib" "$libdir"
     install -m 0644 "./evelauncher-${elver}.tar.gz" "$libdir"
     sed -i s,./eve-transl,$libdir/eve-transl, ./evelauncher.sh
+    sed -i s,SETUPDIR=\"\",SETUPDIR=\"$destdir\", ./evelauncher.sh
     for cmd in evelauncher.sh evewine evewinetricks everegedit evewinecfg evebackup ;do
 	if [ -f "./$cmd" ] ;then
 	    sed -i s,./evesetup.shlib,$libdir/evesetup.shlib, ./$cmd