summarylogtreecommitdiffstats
path: root/evelauncher.shlib
diff options
context:
space:
mode:
authorJernuh Zakalwe2019-07-13 11:27:04 +0200
committerJernuh Zakalwe2019-07-13 11:27:04 +0200
commit373186d2572f7b4ffef482ee63a589919c95ecac (patch)
tree9db11653606c885b3f8c0005deb28b8f393d383c /evelauncher.shlib
parentfe7b2a92d32f6a37bdbbbdd49ae4540a5ff02686 (diff)
downloadaur-373186d2572f7b4ffef482ee63a589919c95ecac.tar.gz
Check for readable EVE.conf added to avoid misleading error messages.
Diffstat (limited to 'evelauncher.shlib')
-rw-r--r--evelauncher.shlib6
1 files changed, 5 insertions, 1 deletions
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"