Evelauncher version check function added.

 Minor changes on evesetup.shlib.

5 files changed, 30 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6acb27493d88..fe4781fd1272 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = evesetup
 	pkgdesc = An inofficial EVE Online Launcher Setup Tool.
 	pkgver = 1548102
-	pkgrel = 1
+	pkgrel = 2
 	url = https://forums.eveonline.com/t/eve-installing/71494
 	arch = x86_64
 	license = custom
@@ -53,10 +53,10 @@ 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 = 351dff8575fe846da69226c9c3ac462917a17c87684b0c4f145bf23aa93934ef
-	sha256sums = c2c8f7ff36b0b8aa8290054697138c846b4810760fe9eddff6bd97514b7933eb
+	sha256sums = 892668cc9ceff769beba2d0b286566937de28ad4b1c245cba5cbb1113e74a4c9
+	sha256sums = b1faa042a96746fe80ea5d85a0c26e80b29353394897774f45b9e48e0639a1d8
 	sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21
-	sha256sums = c3849fd2277cedaacbb68805b7667d3980d763e0f1cc80050628bb42b0e0d380
+	sha256sums = 211473f0ae06eb3646bfaa6c64fcd102ee156df8404c4eef18fdadeecfe6f742
 	sha256sums = a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b
 	sha256sums = cd840d3ad3a21517f30bb4979c97adaaccba2affdddaa5da2889f4fd2ba89578
 	sha256sums = 546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd
diff --git a/PKGBUILD b/PKGBUILD
index 3c4c515fcfbf..fd4402ecf8c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 #Maintainer: Gharim Turen <gharim@turen.de>
 pkgname=evesetup
 pkgver=1548102
-pkgrel=1
+pkgrel=2
 pkgdesc="An inofficial EVE Online Launcher Setup Tool."
 arch=(x86_64)
 url="https://forums.eveonline.com/t/eve-installing/71494"
@@ -105,10 +105,10 @@ package() {
 }
 
 sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4'
-            '351dff8575fe846da69226c9c3ac462917a17c87684b0c4f145bf23aa93934ef'
-            'c2c8f7ff36b0b8aa8290054697138c846b4810760fe9eddff6bd97514b7933eb'
+            '892668cc9ceff769beba2d0b286566937de28ad4b1c245cba5cbb1113e74a4c9'
+            'b1faa042a96746fe80ea5d85a0c26e80b29353394897774f45b9e48e0639a1d8'
             '80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21'
-            'c3849fd2277cedaacbb68805b7667d3980d763e0f1cc80050628bb42b0e0d380'
+            '211473f0ae06eb3646bfaa6c64fcd102ee156df8404c4eef18fdadeecfe6f742'
             'a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b'
             'cd840d3ad3a21517f30bb4979c97adaaccba2affdddaa5da2889f4fd2ba89578'
             '546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd'
diff --git a/evelauncher.sh b/evelauncher.sh
index bc046edfd048..90c944b7b5a3 100644
--- a/evelauncher.sh
+++ b/evelauncher.sh
@@ -12,6 +12,7 @@ WINEPATH="/usr/bin"
 . ./evesetup.shlib
 
 check_env
+check_elv
 check_wine
 check_steam
 
diff --git a/evelauncher.sh.in b/evelauncher.sh.in
index 412442d6fcba..b7a4bee2d156 100644
--- a/evelauncher.sh.in
+++ b/evelauncher.sh.in
@@ -12,6 +12,7 @@ WINEPATH="/usr/bin"
 . ./evesetup.shlib
 
 check_env
+check_elv
 check_wine
 check_steam
 
diff --git a/evesetup.shlib b/evesetup.shlib
index c2fbfae0a7cf..e12f08675241 100644
--- a/evesetup.shlib
+++ b/evesetup.shlib
@@ -11,6 +11,21 @@ SHAREDIR="$HOME/.eve"
 
 # evesetup shared functions
 
+check_elv() {
+	ELBIN=$(getdate $LAUNCHER/evelauncher)
+	ELBIN=$(expr ${ELBIN:-60} / 60 \* 60)
+	ELARC=$(getdate $SETUPDIR/lib/evelauncher-$ELVER.tar.?z)
+	ELARC=$(expr $ELARC / 60 \* 60)
+	if [ "$ELBIN" -lt "$ELARC" ] ;then
+	    if [ -d "$LAUNCHER" ] ;then
+		rm -rf $LAUNCHER
+		desktop_msg "Update EVE Launcher binaries"
+	    fi
+	    tar xf $SETUPDIR/lib/evelauncher-$ELVER.tar.?z -C $EVEDIR
+	    mv $EVEDIR/evelauncher $LAUNCHER
+	fi
+}
+
 check_env() {
     if [ -d "$CONFDIR" ] ;then
 	if [ -r "$EVECONF" ] ;then
@@ -26,8 +41,6 @@ check_env() {
 	echo "UseCustomWine=true" >>$EVECONF
 	echo "CustomWinePath=$WINEPATH/wine" >>$EVECONF
 	mkdir -p $EVEDIR/SharedCache
-	tar xf $SETUPDIR/lib/evelauncher-$ELVER.tar.?z -C $EVEDIR
-	mv $EVEDIR/evelauncher $LAUNCHER
 	if [ -d "$SHAREDIR/ResFiles/" ] ;then
 	    mv $SHAREDIR/ResFiles/ $EVEDIR/SharedCache/
 	    mv $SHAREDIR/*.txt $EVEDIR/SharedCache/
@@ -65,7 +78,7 @@ check_wine() {
     INSTWINE=$(cat $WINEPREFIX/.update-timestamp 2>/dev/null | tr -dc [:digit:]) || true
     WINEINFP=$(readlink -f $CUSTOMWP)
     WINECONF=${WINEINFP%/bin*}/share/wine/wine.inf
-    WINEDATE=$(ls -l --time-style=+%s $WINECONF 2>/dev/null | cut -d' ' -f6)
+    WINEDATE=$(getdate $WINECONF)
     if [ "x$WINEDATE" != "x$INSTWINE" ] ;then
 	desktop_msg "Preparing wine in $WINEPREFIX"
 	env WINEPREFIX=$WINEPREFIX \
@@ -103,6 +116,10 @@ desktop_msg() {
     printf "$(basename $0): $@\n"
 }
 
+getdate() {
+    printf $(ls -l --time-style=+%s $1 2>/dev/null | cut -d' ' -f6)
+}
+
 getval() {
     printf $(grep "$1" $EVECONF | cut -d= -f2)
 }