Check for readable EVE.conf added to avoid misleading error messages.

3 files changed, 7 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fe4814201247..6d52104d28ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -54,7 +54,7 @@ pkgbase = evesetup
 	sha256sums = 6304df1ebaea87d0981705d55ba48d894386beb89a99a571c6835bfca040ffbc
 	sha256sums = a567396933aa615a21493fca0734146b5aa59b76fa2bee060a0e7499b1d34ada
 	sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21
-	sha256sums = 5b4939295916a239324a95f8d46efee1bc0b93b9beea4b515b2dc9ed4763a7be
+	sha256sums = 2b582464968894c64ba6d020e71d2dad4c7c54ef1fba92d4f7d331b47ab37a4b
 	sha256sums = f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c
 	sha256sums = 9c547bc881fce65cfbff3e266990858d29c01b7800a8f42150b3ed3d36068510
 	sha256sums = 04d2a47524cbd132aad2fd310d56515a29310a2e693ba94ce12c65cd776a70d2
diff --git a/PKGBUILD b/PKGBUILD
index fcd8fc13a947..4e9b03c1264a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -109,7 +109,7 @@ sha256sums=('f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731'
             '6304df1ebaea87d0981705d55ba48d894386beb89a99a571c6835bfca040ffbc'
             'a567396933aa615a21493fca0734146b5aa59b76fa2bee060a0e7499b1d34ada'
             '80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21'
-            '5b4939295916a239324a95f8d46efee1bc0b93b9beea4b515b2dc9ed4763a7be'
+            '2b582464968894c64ba6d020e71d2dad4c7c54ef1fba92d4f7d331b47ab37a4b'
             'f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c'
             '9c547bc881fce65cfbff3e266990858d29c01b7800a8f42150b3ed3d36068510'
             '04d2a47524cbd132aad2fd310d56515a29310a2e693ba94ce12c65cd776a70d2'
diff --git a/evelauncher.shlib b/evelauncher.shlib
index 5df71b376a4b..fb692f37d8b4 100644
--- a/evelauncher.shlib
+++ b/evelauncher.shlib
@@ -11,6 +11,10 @@ desktop_msg() {
 
 check_wine() {
     EVECONF=$HOME/.config/CCP/EVE.conf
+    if [ ! -r "$EVECONF" ] ;then
+	desktop_msg "ERROR: EVE Configuration not found!"
+	exit 1
+    fi
     CUSTOMWP=$(grep CustomWinePath $EVECONF | cut -d= -f2)
     SHAREDIR=$(grep SharedCacheFolder $EVECONF | cut -d= -f2)
     UCW=$(grep UseCustomWine $EVECONF | cut -d= -f2)
@@ -28,7 +32,7 @@ check_wine() {
     fi
     INSTWINE=$(cat $WINEPREFIX/.update-timestamp | tr -dc [:digit:]) || true
     WINEINFP=$(readlink -f $CUSTOMWP)
-    WINECONF=$(find ${WINEINFP%/bin*}/share -name 'wine.inf') || true
+    WINECONF=$(find ${WINEINFP%/bin*}/share -name 'wine.inf' 2>/dev/null) || true
     WINEDATE=$(ls -l --time-style=+%s "$WINECONF" 2>/dev/null | cut -d' ' -f6)
     if [ "x$WINEDATE" != "x$INSTWINE" ] ;then
 	desktop_msg "Preparing wine in $WINEPREFIX"