summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--evelauncher.sh8
-rw-r--r--evelauncher.sh.in8
4 files changed, 14 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fbfd6c90f89f..b69a55c1a024 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -50,8 +50,8 @@ 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-1385477.tar.gz
sha256sums = f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731
- sha256sums = c46a2e650032a0dc07befca3e293ef22c1722e60436df1ee422eff73727d33dd
- sha256sums = 69dd8ededd2b90f27f56ee9a0873a932ff01f33712f602b26afd9170aaa7cd83
+ sha256sums = 652b1db2fe8c5aa30779b1002bba2301a6e1532c0b91cc04efef5f540da504e8
+ sha256sums = 04dd517cf7689eac4e99440ebfc8c890078fd1519281d45918d705307fc09ce1
sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21
sha256sums = f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c
sha256sums = d0225e14dd3f619bf6540df134b5545e13bfb0954616a329c48d5eb768862eda
diff --git a/PKGBUILD b/PKGBUILD
index 1de3759e5fb1..4de4e1cbf04f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -103,8 +103,8 @@ package() {
}
sha256sums=('f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731'
- 'c46a2e650032a0dc07befca3e293ef22c1722e60436df1ee422eff73727d33dd'
- '69dd8ededd2b90f27f56ee9a0873a932ff01f33712f602b26afd9170aaa7cd83'
+ '652b1db2fe8c5aa30779b1002bba2301a6e1532c0b91cc04efef5f540da504e8'
+ '04dd517cf7689eac4e99440ebfc8c890078fd1519281d45918d705307fc09ce1'
'80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21'
'f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c'
'd0225e14dd3f619bf6540df134b5545e13bfb0954616a329c48d5eb768862eda'
diff --git a/evelauncher.sh b/evelauncher.sh
index 03d264618cf3..36064b576335 100644
--- a/evelauncher.sh
+++ b/evelauncher.sh
@@ -70,9 +70,11 @@ check_wine() {
env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg add \
'HKEY_CURRENT_USER\Software\Wine\DllOverrides' \
/v winemenubuilder.exe /f >/dev/null
- if [ $($WINEPATH/wine --version | grep -q 3.2 ;echo $?) != 0 ] ;then
- env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \
- $(which winetricks) -q winxp >/dev/null
+ if [ "x$($WINEPATH/wine --version | grep -q 3.2 ;echo $?)" != "x0" ] ;then
+ if [ "x$($WINEPATH/wine --version | grep -q 4.0 ;echo $?)" != "x0" ] ;then
+ env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \
+ $(which winetricks) -q winxp >/dev/null
+ fi
fi
fi
else
diff --git a/evelauncher.sh.in b/evelauncher.sh.in
index 1dc9908d1efb..a19106c1cd5d 100644
--- a/evelauncher.sh.in
+++ b/evelauncher.sh.in
@@ -81,9 +81,11 @@ check_wine() {
env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg add \
'HKEY_CURRENT_USER\Software\Wine\DllOverrides' \
/v winemenubuilder.exe /f >/dev/null
- if [ $($WINEPATH/wine --version | grep -q 3.2 ;echo $?) != 0 ] ;then
- env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \
- $(which winetricks) -q winxp >/dev/null
+ if [ "x$($WINEPATH/wine --version | grep -q 3.2 ;echo $?)" != "x0" ] ;then
+ if [ "x$($WINEPATH/wine --version | grep -q 4.0 ;echo $?)" != "x0" ] ;then
+ env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \
+ $(which winetricks) -q winxp >/dev/null
+ fi
fi
fi
else