Many changes under the hood to make the installation more flexible.

 Shared library and some icons renamed to avoid name conflicts.
 Icon-cache refresh removed, the package manager should do this.

17 files changed, 84 insertions, 106 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6e86cad86f29..fcd062be3670 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = evesetup
 	pkgdesc = An inofficial EVE Online Launcher Setup Tool.
 	pkgver = 1539902
-	pkgrel = 0
+	pkgrel = 1
 	url = https://forums.eveonline.com/t/eve-installing/71494
 	arch = x86_64
 	license = custom
@@ -31,7 +31,7 @@ pkgbase = evesetup
 	source = evelauncher.sh
 	source = evelauncher.sh.in
 	source = evelauncher.sh.real
-	source = evelauncher.shlib
+	source = evesetup.shlib
 	source = everegedit.desktop
 	source = evewine
 	source = evewinecfg.desktop
@@ -52,23 +52,23 @@ pkgbase = evesetup
 	source = eve-transl5.11-zh.tar.gz
 	source = https://github.com/megastep/makeself/releases/download/release-2.4.0/makeself-2.4.0.run
 	source = https://binaries.eveonline.com/evelauncher-1539902.tar.gz
-	sha256sums = f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731
-	sha256sums = ee89bb914f9c624e2d9031fa9694837f14a2ddf8d2cde4927bfedc4bfc427810
-	sha256sums = 63605574731c8eddf22e32c5ffd70c5fadf06b3995d6a8a464b8d7e5e1c802fa
+	sha256sums = ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4
+	sha256sums = b5febef1a55d27af357f88079c0c7a1799971bd570080d91034115230323ef68
+	sha256sums = adb88d519b09f8593d4d1c30472d7d3d6e177bf303dbbc5d8c3360ddd57f4af2
 	sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21
-	sha256sums = f772aaaf0a6951c87fa0d2bcc5f96966a81c7750940140404b001eaf42168f99
-	sha256sums = f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c
-	sha256sums = 5eeb80f73627b2e240843f797995ad60c1ae52f9a9a61bb0653351746477e048
-	sha256sums = 04d2a47524cbd132aad2fd310d56515a29310a2e693ba94ce12c65cd776a70d2
-	sha256sums = 22690e393ee89703b17898038aaa37900805104e8c960b346fe1f6050edc9bce
-	sha256sums = d5047d1648550c3e54672e6b16d2fa67a323d7affa9eae2b0db16b8ed20b7d90
-	sha256sums = f34cef776c79cbd4e5b74d680f04c614c0698fd3a685b1c7cf39e4fed6519bcc
-	sha256sums = 3ec6892df9109260af05fb53c1e980741b7c1b6bf1927b9fc1b1a6253b901cca
+	sha256sums = fb2b6aa2d47365cc88e7ecac6f01def985b008683bb0f9efd7873799e929c7d2
+	sha256sums = a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b
+	sha256sums = cd840d3ad3a21517f30bb4979c97adaaccba2affdddaa5da2889f4fd2ba89578
+	sha256sums = 546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd
+	sha256sums = c83beba543663b926d28d0eda98f1035cd73327da50f718a487763d300415a24
+	sha256sums = f438c7002eaf8e1186a838ac2e803242b7a2c98a22cf49622eb4a64cf4b202ec
+	sha256sums = 04c102d6db1bb8d4159c41f32ec0aa95846c0fb519841a3c1428ab20c850e9cf
+	sha256sums = cc9b7bd4778305b542bd67d043f408c0e30fe7ef82601e7ff2d8d216a71ee904
 	sha256sums = 2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d
-	sha256sums = 94616333dd5c61b8ff44aba26dfabe69a8e8de8bb2fcdc9a10d0ee98a56b9907
-	sha256sums = 3891991a1b700b3d5a524dbeb5015fbe578baf1855066cf0cff89412df84342a
-	sha256sums = 2c192fdc282fefafee5596b60bd1779668b611d386e2bf933eef51d39eac7a28
-	sha256sums = f88c7c28582b6531a021b8fcece47c906f900c48edf453dc04c349f8671cf8a2
+	sha256sums = a62632f591d464565bf5d52ff70a60e3d1a36e6b4f89735228a65f0449a72fc3
+	sha256sums = 5b4d6ca26b58ce6e56099921ab7d2dbacfa7ecd49fbb8e47f8dcd05c99768ad5
+	sha256sums = 69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3
+	sha256sums = 762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422
 	sha256sums = 47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a
 	sha256sums = 1c3df28324c8498e34d2e789fd1f36577afa5a31bdbb278d752f7ef8c6ec5516
 	sha256sums = bb63c2ea31d204f4d8eb270848674ad898ed45bbf0a9cea480611581f1149e4f
diff --git a/PKGBUILD b/PKGBUILD
index 01c400ca6b57..be150512b1fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 #Maintainer: Gharim Turen <gharim@turen.de>
 pkgname=evesetup
 pkgver=1539902
-pkgrel=0
+pkgrel=1
 pkgdesc="An inofficial EVE Online Launcher Setup Tool."
 arch=(x86_64)
 url="https://forums.eveonline.com/t/eve-installing/71494"
@@ -28,7 +28,7 @@ source=("evelauncher.desktop"
         "evelauncher.sh"
         "evelauncher.sh.in"
         "evelauncher.sh.real"
-        "evelauncher.shlib"
+        "evesetup.shlib"
         "everegedit.desktop"
         "evewine"
         "evewinecfg.desktop"
@@ -66,17 +66,20 @@ package() {
         install -d "${pkgdir}/usr/share/icons"
         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"
                 install "${srcdir}/$cmd" "${pkgdir}/opt/${pkgname}/bin"
             else
                 ln -s evewine "${pkgdir}/opt/${pkgname}/bin/$cmd"
             fi
             ln -s "/opt/${pkgname}/bin/$cmd" "${pkgdir}/usr/bin/$cmd"
             if [ ! "$cmd" = "evewine" ] ;then
+                oexec=$(grep Exec= ./${cmd%.*}.desktop)
+                sed -i s,$oexec,Exec=/usr/bin/$cmd, ./${cmd%.*}.desktop
                 cp "${srcdir}/${cmd%.*}.desktop" "${pkgdir}/usr/share/applications/"
             fi
         done
         sed -i s,ELVER=\"\",ELVER=\"${pkgver}\", "${pkgdir}/opt/${pkgname}/bin/evelauncher.sh"
-        cp ${srcdir}/evelauncher.shlib ${pkgdir}/opt/${pkgname}/lib
+        cp ${srcdir}/evesetup.shlib ${pkgdir}/opt/${pkgname}/lib
         cp -r ${srcdir}/icons ${pkgdir}/usr/share/
         rm -rf ${srcdir}/evelauncher/resources/ ${srcdir}/evelauncher/plugins/
         rm -f ${srcdir}/evelauncher/*Qt* ${srcdir}/evelauncher/libcrypto*
@@ -101,23 +104,23 @@ package() {
         tar cJf ${pkgdir}/opt/${pkgname}/lib/evelauncher-${pkgver}.tar.xz evelauncher/
 }
 
-sha256sums=('f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731'
-            'ee89bb914f9c624e2d9031fa9694837f14a2ddf8d2cde4927bfedc4bfc427810'
-            '63605574731c8eddf22e32c5ffd70c5fadf06b3995d6a8a464b8d7e5e1c802fa'
+sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4'
+            'b5febef1a55d27af357f88079c0c7a1799971bd570080d91034115230323ef68'
+            'adb88d519b09f8593d4d1c30472d7d3d6e177bf303dbbc5d8c3360ddd57f4af2'
             '80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21'
-            'f772aaaf0a6951c87fa0d2bcc5f96966a81c7750940140404b001eaf42168f99'
-            'f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c'
-            '5eeb80f73627b2e240843f797995ad60c1ae52f9a9a61bb0653351746477e048'
-            '04d2a47524cbd132aad2fd310d56515a29310a2e693ba94ce12c65cd776a70d2'
-            '22690e393ee89703b17898038aaa37900805104e8c960b346fe1f6050edc9bce'
-            'd5047d1648550c3e54672e6b16d2fa67a323d7affa9eae2b0db16b8ed20b7d90'
-            'f34cef776c79cbd4e5b74d680f04c614c0698fd3a685b1c7cf39e4fed6519bcc'
-            '3ec6892df9109260af05fb53c1e980741b7c1b6bf1927b9fc1b1a6253b901cca'
+            'fb2b6aa2d47365cc88e7ecac6f01def985b008683bb0f9efd7873799e929c7d2'
+            'a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b'
+            'cd840d3ad3a21517f30bb4979c97adaaccba2affdddaa5da2889f4fd2ba89578'
+            '546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd'
+            'c83beba543663b926d28d0eda98f1035cd73327da50f718a487763d300415a24'
+            'f438c7002eaf8e1186a838ac2e803242b7a2c98a22cf49622eb4a64cf4b202ec'
+            '04c102d6db1bb8d4159c41f32ec0aa95846c0fb519841a3c1428ab20c850e9cf'
+            'cc9b7bd4778305b542bd67d043f408c0e30fe7ef82601e7ff2d8d216a71ee904'
             '2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d'
-            '94616333dd5c61b8ff44aba26dfabe69a8e8de8bb2fcdc9a10d0ee98a56b9907'
-            '3891991a1b700b3d5a524dbeb5015fbe578baf1855066cf0cff89412df84342a'
-            '2c192fdc282fefafee5596b60bd1779668b611d386e2bf933eef51d39eac7a28'
-            'f88c7c28582b6531a021b8fcece47c906f900c48edf453dc04c349f8671cf8a2'
+            'a62632f591d464565bf5d52ff70a60e3d1a36e6b4f89735228a65f0449a72fc3'
+            '5b4d6ca26b58ce6e56099921ab7d2dbacfa7ecd49fbb8e47f8dcd05c99768ad5'
+            '69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3'
+            '762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422'
             '47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a'
             '1c3df28324c8498e34d2e789fd1f36577afa5a31bdbb278d752f7ef8c6ec5516'
             'bb63c2ea31d204f4d8eb270848674ad898ed45bbf0a9cea480611581f1149e4f'
diff --git a/build_installer.sh b/build_installer.sh
index 71f108115d3d..126dbf2f7137 100755
--- a/build_installer.sh
+++ b/build_installer.sh
@@ -64,15 +64,10 @@ for cmd in evelauncher.sh everegedit evewine evewinecfg evewinetricks evebackup
     if [ -f ../$cmd ] ;then cp ../$cmd evesetup/ ;fi
     if [ ! "$cmd" = "evewine" ] ;then cp ../${cmd%.*}.desktop evesetup/ ;fi
 done
-cp ../evelauncher.shlib evesetup/evelauncher.shlib
+cp ../evesetup.shlib evesetup/evesetup.shlib
 cp ../evelauncher.sh.in evesetup/evelauncher.sh
 sed -i s,ELVER=\"\",ELVER=\"$version\", evesetup/evelauncher.sh
-grep -v '^#-' ../setup.sh.in >evesetup/setup.sh
-#-- testing only
-#- cp -f ../setup.sh.in evesetup/setup.sh
-#- sed -i 's,#- , ,' evesetup/setup.sh
-#- release="test"
-#--
+cp ../setup.sh.in evesetup/setup.sh
 sed -i s,elver=\"\",elver=\"$version\", evesetup/setup.sh
 sed -i s,elcsum=\"\",elcsum=\"$elcsum\", evesetup/setup.sh
 chmod a+x evesetup/setup.sh
diff --git a/eve-icons.tar.gz b/eve-icons.tar.gz
index 35d320659c04..4ea98e1db103 100644
--- a/eve-icons.tar.gz
+++ b/eve-icons.tar.gz
diff --git a/eve-icons_large.tar.gz b/eve-icons_large.tar.gz
index e6fc63e2384b..7327d9ba86b1 100644
--- a/eve-icons_large.tar.gz
+++ b/eve-icons_large.tar.gz
diff --git a/evebackup b/evebackup
index 180c0094a176..0e2c114a8661 100644
--- a/evebackup
+++ b/evebackup
@@ -4,7 +4,7 @@ set -e
 
 # WIP use at own risk
 
-. /opt/evesetup/lib/evelauncher.shlib
+. ./evesetup.shlib
 
 SHAREDIR=$(grep SharedCacheFolder $EVECONF | cut -d= -f2)
 BCKUPDIR=$(xdg-user-dir DOCUMENTS 2>/dev/null || true)/EVE
diff --git a/evebackup.desktop b/evebackup.desktop
index a74652887f45..3ee5f20e348a 100644
--- a/evebackup.desktop
+++ b/evebackup.desktop
@@ -2,9 +2,9 @@
 Version=1.0
 Type=Application
 Name=EVE Backup
-Icon=archive
+Icon=archivemanager
 Comment=Backup user settings
-Exec=/usr/bin/evebackup
+Exec=evebackup
 NoDisplay=false
 Categories=Utility;Wine;
 StartupNotify=false
diff --git a/evelauncher.desktop b/evelauncher.desktop
index 8b542416eb35..86ed89a3f74c 100644
--- a/evelauncher.desktop
+++ b/evelauncher.desktop
@@ -4,7 +4,7 @@ Type=Application
 Name=EVE Online Launcher
 Icon=evelauncher
 Comment=Discover New Eden
-Exec=/usr/bin/evelauncher.sh
+Exec=evelauncher.sh
 NoDisplay=false
 Categories=Game;
 StartupNotify=true
diff --git a/evelauncher.sh b/evelauncher.sh
index a1ceced547d3..fd3bf7cb0bfe 100644
--- a/evelauncher.sh
+++ b/evelauncher.sh
@@ -6,10 +6,9 @@ ELVER=""
 QTVER="5.11"
 EVEDIR="$HOME/.local/lib/EVE"
 LAUNCHER="$EVEDIR/Launcher"
-SETUPDIR="/opt/evesetup"
 WINEPATH="/usr/bin"
 
-. $SETUPDIR/lib/evelauncher.shlib
+. ./evesetup.shlib
 
 check_env
 check_wine
diff --git a/evelauncher.sh.in b/evelauncher.sh.in
index 2d02ae93cbce..b46df0e6c92d 100644
--- a/evelauncher.sh.in
+++ b/evelauncher.sh.in
@@ -6,10 +6,9 @@ ELVER=""
 QTVER="5.11"
 EVEDIR="$HOME/.local/lib/EVE"
 LAUNCHER="$EVEDIR/Launcher"
-SETUPDIR="/opt/evesetup"
 WINEPATH="/usr/bin"
 
-. $SETUPDIR/lib/evelauncher.shlib
+. ./evesetup.shlib
 
 check_env
 check_wine
@@ -17,7 +16,7 @@ check_steam
 
 if [ ! -r "$LAUNCHER/translations/qt_en.qm" ] ;then
     if [ -r "$LAUNCHER/libQt5Core.so.$QTVER.0" ] ;then
-	for eta in $(ls $SETUPDIR/lib/eve-transl${QTVER}-??.tar.gz) ;do
+	for eta in $(ls ./eve-transl${QTVER}-??.tar.gz) ;do
 	    tar xf $eta -C $LAUNCHER
 	done
     fi
diff --git a/everegedit.desktop b/everegedit.desktop
index c3d98947f329..e6131f6316d2 100644
--- a/everegedit.desktop
+++ b/everegedit.desktop
@@ -2,9 +2,9 @@
 Version=1.0
 Type=Application
 Name=EVE Registry Editor
-Icon=regedit
+Icon=everegedit
 Comment=Wine Registry Editor for EVE
-Exec=/usr/bin/everegedit
+Exec=everegedit
 NoDisplay=false
 Categories=Utility;Wine;
 StartupNotify=false
diff --git a/evelauncher.shlib b/evesetup.shlib
index 44c755a3dca5..c2ce68e19a83 100644
--- a/evelauncher.shlib
+++ b/evesetup.shlib
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Evelauncher fixed values
+# evelauncher fixed values
 
 CONFDIR="$HOME/.config/CCP"
 EVECONF="$CONFDIR/EVE.conf"
@@ -9,7 +9,7 @@ EVECONF="$CONFDIR/EVE.conf"
 
 SHAREDIR="$HOME/.eve"
 
-# Evelauncher shared functions
+# evesetup shared functions
 
 check_env() {
     if [ -d "$CONFDIR" ] ;then
diff --git a/evewine b/evewine
index fcf3128fd3be..2e23dcd1971b 100644
--- a/evewine
+++ b/evewine
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. /opt/evesetup/lib/evelauncher.shlib
+. ./evesetup.shlib
 
 check_wine
 
diff --git a/evewinecfg.desktop b/evewinecfg.desktop
index af51f40a7b1b..5b5e905e7f3b 100644
--- a/evewinecfg.desktop
+++ b/evewinecfg.desktop
@@ -2,9 +2,9 @@
 Version=1.0
 Type=Application
 Name=EVE Configuration
-Icon=winecfg
+Icon=evewinecfg
 Comment=Wine Configuration for EVE
-Exec=/usr/bin/evewinecfg
+Exec=evewinecfg
 NoDisplay=false
 Categories=Utility;Wine;
 StartupNotify=false
diff --git a/evewinetricks b/evewinetricks
index 708b4ff20854..29c209e26ebf 100644
--- a/evewinetricks
+++ b/evewinetricks
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. /opt/evesetup/lib/evelauncher.shlib
+. ./evesetup.shlib
 
 check_wine
 
diff --git a/evewinetricks.desktop b/evewinetricks.desktop
index 6082d1172de1..42887292544b 100644
--- a/evewinetricks.desktop
+++ b/evewinetricks.desktop
@@ -4,7 +4,7 @@ Type=Application
 Name=EVE Winetricks
 Icon=winetricks
 Comment=Winetricks for EVE
-Exec=/usr/bin/evewinetricks
+Exec=evewinetricks
 NoDisplay=false
 Categories=Utility;Wine;
 StartupNotify=false
diff --git a/setup.sh.in b/setup.sh.in
index 8a9efddae584..909fb2c3a38c 100644
--- a/setup.sh.in
+++ b/setup.sh.in
@@ -3,60 +3,47 @@
 set -e
 
 bootstrap_install() {
-    install -dv "${target}/bin/"
-    install -d "${prefix}/bin/"
-    install -d "${prefix}/share/applications/"
+    install -dv "$destdir"
+    install -dv "$bindir"
+    install -dv "$libdir"
+    install -d "$prefix/bin/"
+    install -d "$prefix/share/applications/"
+    for eta in $(ls ./eve-transl${qtver}-??.tar.gz) ;do
+	install -m 0644 "$eta" "$libdir"
+    done
+    install -m 0644 "./evesetup.shlib" "$libdir"
+    install -m 0644 "./evelauncher-${elver}.tar.gz" "$libdir"
+    sed -i s,./eve-transl,$libdir/eve-transl, ./evelauncher.sh
     for cmd in evelauncher.sh evewine evewinetricks everegedit evewinecfg evebackup ;do
 	if [ -f "./$cmd" ] ;then
-	    install "./$cmd" "${target}/bin/"
+	    sed -i s,./evesetup.shlib,$libdir/evesetup.shlib, ./$cmd
+	    install "./$cmd" "$bindir/"
 	else
-	    ln -sf evewine "${target}/bin/${cmd}"
+	    ln -sf evewine "$bindir/$cmd"
 	fi
-	ln -s "${target}/bin/$cmd" "${prefix}/bin/$cmd"
+	[ "$bindir" != "$prefix/bin" ] && ln -s "$bindir/$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
-#--
-	    install -m 0644 "./${cmd%.*}.desktop" "${prefix}/share/applications/"
-#-- testing only
-#- sed -i s,Exec=$prefix/bin/$cmd,$oexec, ./${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/"
 	fi
     done
-    install -dv "${target}/lib/"
-    for eta in $(ls ./eve-transl${qtver}-??.tar.gz) ;do
-	install -m 0644 "$eta" "${target}/lib"
-    done
-    install -m 0644 "./evelauncher.shlib" "${target}/lib"
-    install -m 0644 "./evelauncher-${elver}.tar.gz" "${target}/lib"
     for icons in $(find . -type f -name '*.png') ;do
-	install -D -m 0644 "$icons" "${prefix}/share/${icons#*/}"
+	install -D -m 0644 "$icons" "$prefix/share/${icons#*/}"
     done
-    if [ -x $(which gtk-update-icon-cache) ] ;then
-	gtk-update-icon-cache -t -f "${prefix}/share/icons/hicolor" 2>/dev/null
-	[ -f "${prefix}/share/icons/hicolor/icon-theme.cache" ] && \
-	    chmod 0644 "${prefix}/share/icons/hicolor/icon-theme.cache"
-    fi
 }
 
 bootstrap_remove() {
     for icons in $(find . -type f -name '*.png') ;do
-	rm -f "${prefix}/share/${icons#*/}"
+	rm -f "$prefix/share/${icons#*/}"
     done
-    if [ -x $(which gtk-update-icon-cache) ] ;then
-	gtk-update-icon-cache -t -f "${prefix}/share/icons/hicolor" 2>/dev/null
-	[ -f "${prefix}/share/icons/hicolor/icon-theme.cache" ] && \
-	    chmod 0644 "${prefix}/share/icons/hicolor/icon-theme.cache"
-    fi
-    rm -rfv "${target}/lib/"
     for cmd in evelauncher.sh everegedit evewine evewinecfg evewinetricks evebackup ;do
-	rm -fv "${prefix}/bin/$cmd"
+	rm -fv "$prefix/bin/$cmd"
 	if [ ! "$cmd" = "evewine" ] ;then
-	    rm -f "${prefix}/share/applications/${cmd%.*}.desktop"
+	    rm -f "$prefix/share/applications/${cmd%.*}.desktop"
 	fi
     done
-    rm -rfv "${target}"
+    rm -rfv "$destdir"
 }
 
 build_lib() {
@@ -130,13 +117,15 @@ check_req() {
     fi
 }
 
-target="/opt/evesetup"
 prefix="/usr"
-key=""
+destdir="/opt/evesetup"
+bindir="$destdir/bin"
+libdir="$destdir/lib"
 qtver="5.11"
 elver=""
 elcsum=""
 rcsum=""
+key=""
 
 if [ $(id -u) -ne 0 ] ;then
     printf "\nEVE Online Launcher Setup need root permissions."
@@ -144,16 +133,12 @@ if [ $(id -u) -ne 0 ] ;then
     exit 0
 fi
 
-if [ -d "${target}/bin/" ] ;then
+if [ -d "$destdir" ] ;then
     printf "\n"
     read -p 'Remove EVE Online Launcher Setup? (Y/n) ' key
     [ ! "x$(echo $key | tr [:upper:] [:lower:])" = "xn" ] && \
 	bootstrap_remove
 else
-#-- testing only
-#- 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
     [ ! "x$(echo $key | tr [:upper:] [:lower:])" = "xn" ] && \
@@ -163,8 +148,5 @@ else
 	bootstrap_install && \
 	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
-#--
 fi
 printf "\nDone.\n\n"