diff options
author | Jernuh Zakalwe | 2019-05-18 13:40:41 +0200 |
---|---|---|
committer | Jernuh Zakalwe | 2019-05-18 13:40:41 +0200 |
commit | 7df26de58f133d72e8dab721c1ae3ea6211b7a11 (patch) | |
tree | 3c7c74234e3a17525cb4c4fad93836889a97bc90 /evelauncher.sh.in | |
parent | 6e428367e3223ba828344efbe4d142cf400014a1 (diff) | |
download | aur-7df26de58f133d72e8dab721c1ae3ea6211b7a11.tar.gz |
Support for older wine versions less than 4.0 removed.
Info message for using internal wine version removed.
Using other registry setting to suppress winemenubuilder file associations.
Minor changes on internal test routines.
Diffstat (limited to 'evelauncher.sh.in')
-rw-r--r-- | evelauncher.sh.in | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/evelauncher.sh.in b/evelauncher.sh.in index 136c11ad93a8..6c6cad872f9f 100644 --- a/evelauncher.sh.in +++ b/evelauncher.sh.in @@ -53,30 +53,19 @@ 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 - desktop_msg "Preparing wine in $WINEPREFIX" - env WINEPREFIX=$WINEPREFIX \ + desktop_msg "Preparing wine in $WINEPREFIX" + env WINEPREFIX=$WINEPREFIX \ WINEDEBUG=-all \ WINEDLLOVERRIDES="mscoree,mshtml,winemenubuilder.exe=d" \ $WINEPATH/wine wineboot - env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg delete \ - 'HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\RunServices' \ - /v winemenubuilder /f >/dev/null || true - env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg add \ - 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' \ - /v winemenubuilder.exe /f >/dev/null WINETRP=$(grep -v win[x1..9] $WINEPREFIX/winetricks.log 2>/dev/null | uniq) + rm $WINEPREFIX/winetricks.log 2>/dev/null || true 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. ;echo $?)" != "x0" ] ;then - WINVER=winxp - else - WINVER=win10 - fi env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \ - $(which winetricks) -q --force $WINVER >/dev/null + $(which winetricks) -q --force win10 >/dev/null fi } |