In function check_elv terminate hanging evelauncher processes added

Minor changes in evelaucher.sh.real
Categories in desktop launcher files changed

9 files changed, 28 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9ceee9880d37..4b396ca94dc7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = evesetup
 	pkgdesc = An inofficial EVE Online Launcher Setup Tool.
 	pkgver = 1747682
-	pkgrel = 11
+	pkgrel = 12
 	url = https://forums.eveonline.com/t/299030
 	changelog = evesetup.changelog
 	arch = x86_64
@@ -56,15 +56,15 @@ pkgbase = evesetup
 	source = https://github.com/megastep/makeself/releases/download/release-2.4.0/makeself-2.4.0.run
 	source = https://github.com/doitsujin/dxvk/releases/download/v1.9/dxvk-1.9.tar.gz
 	source = https://binaries.eveonline.com/evelauncher-1747682.tar.gz
-	sha256sums = ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4
+	sha256sums = 3faf7c07b571a80f05b46b44b832e1986bf45d2a84c2cba0fceda4d38a5a9259
 	sha256sums = 29b6f2cda542c8f3f3845fb3e1ff3e9ac2a645d389c1618bdac5fa69947a2b4b
 	sha256sums = 77b8a8d1cde800956dadf8abf35287c34b3c844c40dfa8f89ed01ca2cde345fb
-	sha256sums = 168478fca0bc7be5be3ed2a44e3b64732d2b0ef0758f7d9bd51ec56b7e0713eb
-	sha256sums = a7e044defcc95bcd86e4721f888fd1dee234b718dd58eff862697d164dc342b9
-	sha256sums = a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b
+	sha256sums = 008ea3e1c1b8faaf61f0ddf9a53599058c7a97ebe6e719803d002f0eb6042602
+	sha256sums = 03e5eb09f931935cab02b3f30cfc9f9356f92558b3c1d691cbf60e1360a571c7
+	sha256sums = ac6ead162ec27c3ab9481f1a7907dc906b1a1be121820a6aed2ad1d8312a72d6
 	sha256sums = 94679e947e7ecaa5f2b1da96b53d92e74aa45c19aab1f6d2fc7d28d3fea3ac1d
-	sha256sums = 546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd
-	sha256sums = c83beba543663b926d28d0eda98f1035cd73327da50f718a487763d300415a24
+	sha256sums = c86790a014cb765577d269e98595c1e41f988fbb805a521e7a0083cf4b16b8ad
+	sha256sums = e485a1ab084a7c59bd97064e5d616f621e2e40a0e95008ce0891cc06e06792f4
 	sha256sums = 68a0f72b795a062b118745ae29f377863111e893f6536cd1a6cc7e633f3a1b29
 	sha256sums = 30b6440b842c19df64892cc560c274a7cc4f5de910a9f81e12dd0d76da561474
 	sha256sums = ebdeaa2a143b8d247d94b4a57a45065c299253c074f5d741870a78dd384c29f0
@@ -88,4 +88,3 @@ pkgbase = evesetup
 	sha256sums = 98ccf4b9932d7fb74896461f764c61921592a73089e3fcb4063fe7836c6a0bca
 
 pkgname = evesetup
-
diff --git a/PKGBUILD b/PKGBUILD
index 2124c623c478..5dc3b27d844b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 #Maintainer: Jernuh Zakalwe <jzakalwe1st@gmail.com>
 pkgname=evesetup
 pkgver=1747682
-pkgrel=11
+pkgrel=12
 pkgdesc="An inofficial EVE Online Launcher Setup Tool."
 changelog=$pkgname.changelog
 arch=(x86_64)
@@ -119,15 +119,15 @@ package() {
         tar czf ${pkgdir}/opt/${pkgname}/lib/evelauncher-${pkgver}.tar.gz evelauncher/
 }
 
-sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4'
+sha256sums=('3faf7c07b571a80f05b46b44b832e1986bf45d2a84c2cba0fceda4d38a5a9259'
             '29b6f2cda542c8f3f3845fb3e1ff3e9ac2a645d389c1618bdac5fa69947a2b4b'
             '77b8a8d1cde800956dadf8abf35287c34b3c844c40dfa8f89ed01ca2cde345fb'
-            '168478fca0bc7be5be3ed2a44e3b64732d2b0ef0758f7d9bd51ec56b7e0713eb'
-            'a7e044defcc95bcd86e4721f888fd1dee234b718dd58eff862697d164dc342b9'
-            'a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b'
+            '008ea3e1c1b8faaf61f0ddf9a53599058c7a97ebe6e719803d002f0eb6042602'
+            '03e5eb09f931935cab02b3f30cfc9f9356f92558b3c1d691cbf60e1360a571c7'
+            'ac6ead162ec27c3ab9481f1a7907dc906b1a1be121820a6aed2ad1d8312a72d6'
             '94679e947e7ecaa5f2b1da96b53d92e74aa45c19aab1f6d2fc7d28d3fea3ac1d'
-            '546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd'
-            'c83beba543663b926d28d0eda98f1035cd73327da50f718a487763d300415a24'
+            'c86790a014cb765577d269e98595c1e41f988fbb805a521e7a0083cf4b16b8ad'
+            'e485a1ab084a7c59bd97064e5d616f621e2e40a0e95008ce0891cc06e06792f4'
             '68a0f72b795a062b118745ae29f377863111e893f6536cd1a6cc7e633f3a1b29'
             '30b6440b842c19df64892cc560c274a7cc4f5de910a9f81e12dd0d76da561474'
             'ebdeaa2a143b8d247d94b4a57a45065c299253c074f5d741870a78dd384c29f0'
diff --git a/evelauncher.desktop b/evelauncher.desktop
index 86ed89a3f74c..c12f7e747043 100644
--- a/evelauncher.desktop
+++ b/evelauncher.desktop
@@ -6,7 +6,7 @@ Icon=evelauncher
 Comment=Discover New Eden
 Exec=evelauncher.sh
 NoDisplay=false
-Categories=Game;
+Categories=Game;Wine;
 StartupNotify=true
 Terminal=false
 StartupWMClass=evelauncher
diff --git a/evelauncher.sh.real b/evelauncher.sh.real
index 06ce1aead71e..b303c2713d1c 100644
--- a/evelauncher.sh.real
+++ b/evelauncher.sh.real
@@ -15,11 +15,9 @@ export LD_LIBRARY_PATH
 "$dirname/$appname" "$@" &
 
 if [ -x "$(which lsof)" ] ;then
-	sleep 10
-	until [ "$(lsof -t -u $(whoami) -a -c /evelauncher$/ -- \
-			$HOME/.local/share/CCP/EVE/QtWebEngine/Default/IndexedDB/https_launcher.eveonline.com_0.indexeddb.leveldb/LOCK)" = "" ]
-	do
-		sleep 10
-	done
-	kill $(lsof -t -u $(whoami) -a -c /evelauncher$/)
+sleep 10
+until [ "$(lsof -t -u $(whoami) -a -c /evelauncher$/ -- \
+ $HOME/.local/share/CCP/EVE/QtWebEngine/Default/IndexedDB/https_launcher.eveonline.com_0.indexeddb.leveldb/LOCK)" = "" ]
+do sleep 10 ;done
+/usr/bin/kill -s TERM evelauncher
 fi
diff --git a/everegedit.desktop b/everegedit.desktop
index e6131f6316d2..7932b70d7c3b 100644
--- a/everegedit.desktop
+++ b/everegedit.desktop
@@ -6,6 +6,6 @@ Icon=everegedit
 Comment=Wine Registry Editor for EVE
 Exec=everegedit
 NoDisplay=false
-Categories=Utility;Wine;
+Categories=Wine;
 StartupNotify=false
 Terminal=false
diff --git a/evesetup.changelog b/evesetup.changelog
index 4a4ca4dde9cd..7373cd455efc 100644
--- a/evesetup.changelog
+++ b/evesetup.changelog
@@ -1,2 +1,4 @@
-Update DXVK to version 1.9
+In function check_elv terminate hanging evelauncher processes added
+Minor changes in evelaucher.sh.real
+Categories in desktop launcher files changed
 
diff --git a/evesetup.shlib b/evesetup.shlib
index 5d42a60454d4..7dc0e63ed607 100644
--- a/evesetup.shlib
+++ b/evesetup.shlib
@@ -5,6 +5,7 @@ EVECONF="$CONFDIR/EVE.conf"
 SHAREDIR="$HOME/.eve"
 
 check_elv() {
+	/usr/bin/kill -s TERM evelauncher 2>/dev/null || true
 	ELBIN=$(getdate $LAUNCHER/evelauncher)
 	ELARC=$(getdate $SETUPDIR/lib/evelauncher-$ELVER.tar.?z)
 	if [ "$ELBIN" -lt "$ELARC" ] ;then
@@ -37,6 +38,7 @@ SharedCacheFolder=$EVEDIR/SharedCache/
 UseCustomWine=true
 CustomWinePath=$WINEPATH/wine
 LauncherRunClientsWithDx9=false
+LauncherShouldMinimizeToTray=false
 EOF
 		mkdir -p $EVEDIR/SharedCache
 		if [ -d "$SHAREDIR/ResFiles/" ] ;then
diff --git a/evewinecfg.desktop b/evewinecfg.desktop
index 5b5e905e7f3b..7679d06bbe1f 100644
--- a/evewinecfg.desktop
+++ b/evewinecfg.desktop
@@ -6,6 +6,6 @@ Icon=evewinecfg
 Comment=Wine Configuration for EVE
 Exec=evewinecfg
 NoDisplay=false
-Categories=Utility;Wine;
+Categories=Wine;
 StartupNotify=false
 Terminal=false
diff --git a/evewinetricks.desktop b/evewinetricks.desktop
index 42887292544b..230e70751d2d 100644
--- a/evewinetricks.desktop
+++ b/evewinetricks.desktop
@@ -6,6 +6,6 @@ Icon=winetricks
 Comment=Winetricks for EVE
 Exec=evewinetricks
 NoDisplay=false
-Categories=Utility;Wine;
+Categories=Wine;
 StartupNotify=false
 Terminal=false