diff options
| author | Jernuh Zakalwe | 2019-05-18 14:48:23 +0200 |
|---|---|---|
| committer | Jernuh Zakalwe | 2019-05-18 14:48:23 +0200 |
| commit | 25b48dc833ee9c629829c1fda1f85a680c642e16 (patch) | |
| tree | 7d856ccd59e7d8103a58141e5f7091309f06c7c5 | |
| parent | 7df26de58f133d72e8dab721c1ae3ea6211b7a11 (diff) | |
| download | aur-25b48dc833ee9c629829c1fda1f85a680c642e16.tar.gz | |
Remove internal wine after switching to custom wine to avoid internal registry call.
Set now winemenubuilder file associations setting on every start from evelauncher.
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | evelauncher.sh | 6 | ||||
| -rw-r--r-- | evelauncher.sh.in | 3 | ||||
| -rw-r--r-- | evelauncher.shlib | 1 |
5 files changed, 13 insertions, 9 deletions
@@ -51,10 +51,10 @@ 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-1501045.tar.gz sha256sums = f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731 - sha256sums = ffd9cd5d9089aaaa3ce97c875ff31317b0b37919da3bd73992685d98c7372e89 - sha256sums = 2f2bc13df9e1a8bd6254519adfe538b527085710164e46d2874fd55d46dcffa8 + sha256sums = 9689911486ed3926177a30e1bc17acbedafa04dff368b859fd7fc948b51adb79 + sha256sums = 60bf1311620c96d74b76ef766d58583ac281abbfacc5211cca22c72194d0dcbd sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21 - sha256sums = 32bd8115ce7563ed0c59eaf76f0ec4a8617934bf9a0fff42a285a1c4d0e38041 + sha256sums = 1b13f885ae3f62d7eaac1cf50f7ad05e62513117d7084822f9b8d2779f3efab4 sha256sums = f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c sha256sums = 459b74ad54268610e7e222407f2cb4efd2e9734e47c1c20c52f8f3c00034c623 sha256sums = 04d2a47524cbd132aad2fd310d56515a29310a2e693ba94ce12c65cd776a70d2 @@ -105,10 +105,10 @@ package() { } sha256sums=('f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731' - 'ffd9cd5d9089aaaa3ce97c875ff31317b0b37919da3bd73992685d98c7372e89' - '2f2bc13df9e1a8bd6254519adfe538b527085710164e46d2874fd55d46dcffa8' + '9689911486ed3926177a30e1bc17acbedafa04dff368b859fd7fc948b51adb79' + '60bf1311620c96d74b76ef766d58583ac281abbfacc5211cca22c72194d0dcbd' '80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21' - '32bd8115ce7563ed0c59eaf76f0ec4a8617934bf9a0fff42a285a1c4d0e38041' + '1b13f885ae3f62d7eaac1cf50f7ad05e62513117d7084822f9b8d2779f3efab4' 'f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c' '459b74ad54268610e7e222407f2cb4efd2e9734e47c1c20c52f8f3c00034c623' '04d2a47524cbd132aad2fd310d56515a29310a2e693ba94ce12c65cd776a70d2' diff --git a/evelauncher.sh b/evelauncher.sh index 5629446dcafb..43535e9d1bb1 100644 --- a/evelauncher.sh +++ b/evelauncher.sh @@ -49,9 +49,6 @@ check_wine() { WINEDEBUG=-all \ WINEDLLOVERRIDES="mscoree,mshtml,winemenubuilder.exe=d" \ $WINEPATH/wine wineboot - env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg add \ - 'HKEY_CURRENT_USER\Software\Wine\FileOpenAssociations' \ - /v Enable /d N /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 @@ -61,6 +58,9 @@ check_wine() { env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \ $(which winetricks) -q --force win10 >/dev/null fi + env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg add \ + 'HKEY_CURRENT_USER\Software\Wine\FileOpenAssociations' \ + /v Enable /d N /f >/dev/null } ELVER="1501045" diff --git a/evelauncher.sh.in b/evelauncher.sh.in index 6c6cad872f9f..0b42b18b1e80 100644 --- a/evelauncher.sh.in +++ b/evelauncher.sh.in @@ -67,6 +67,9 @@ check_wine() { env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \ $(which winetricks) -q --force win10 >/dev/null fi + env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg add \ + 'HKEY_CURRENT_USER\Software\Wine\FileOpenAssociations' \ + /v Enable /d N /f >/dev/null } ELVER="1501045" diff --git a/evelauncher.shlib b/evelauncher.shlib index 4a219170696c..ea8d9b5b6cd4 100644 --- a/evelauncher.shlib +++ b/evelauncher.shlib @@ -17,6 +17,7 @@ check_custom_wine() { WINEPREFIX=${SHAREDIR}wineenv if [ "x$UCW" = "xtrue" ] ;then WINEPATH=${CUSTOMWP%/*} + [ -d "${SHAREDIR}wine" ] && rm -rf ${SHAREDIR}wine else CUSTOMWP=${SHAREDIR}wine WINEPATH=${SHAREDIR}wine/bin |