diff options
| author | Jernuh Zakalwe | 2019-01-27 11:27:10 +0100 |
|---|---|---|
| committer | Jernuh Zakalwe | 2019-01-27 11:27:10 +0100 |
| commit | 63e4d51963963bbca9c656270606c1a4a2ae1e06 (patch) | |
| tree | 7a8dcd41a1ad44cadb941b23169fd4323d977bf8 /evelauncher.sh | |
| parent | 7a8e46cb87022b84e1d39196fbb146087cb35592 (diff) | |
| download | aur-63e4d51963963bbca9c656270606c1a4a2ae1e06.tar.gz | |
Wine version check in evelauncher.sh of version <=3.20 removed because wine stable are now 4.0
Added winetricks call in evelauncher.sh which reinstall winetricks verbs after changing used wine
Diffstat (limited to 'evelauncher.sh')
| -rw-r--r-- | evelauncher.sh | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/evelauncher.sh b/evelauncher.sh index 36064b576335..ca810afd31ed 100644 --- a/evelauncher.sh +++ b/evelauncher.sh @@ -58,7 +58,7 @@ check_wine() { 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 - launcher_msg "Preparing/Updating wine in $WINEPREFIX" + launcher_msg "Preparing wine in $WINEPREFIX" env WINEARCH=win32 \ WINEPREFIX=$WINEPREFIX \ WINEDEBUG=-all \ @@ -70,11 +70,15 @@ check_wine() { env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg add \ 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' \ /v winemenubuilder.exe /f >/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 + WINETRP=$(grep -v winxp $WINEPREFIX/winetricks.log 2>/dev/null | uniq) + if [ "x$WINETRP" != "x" ] ;then + rm $WINEPREFIX/winetricks.log + env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \ + $(which winetricks) -q --force $WINETRP >/dev/null + fi + 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 else |