diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | evelauncher.sh | 16 | ||||
| -rw-r--r-- | evelauncher.sh.in | 18 | ||||
| -rw-r--r-- | evewine | 8 | ||||
| -rw-r--r-- | evewinetricks | 4 |
6 files changed, 31 insertions, 31 deletions
@@ -50,14 +50,14 @@ 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 = e865cf10831a1e0cb2a615b4b97330bdeeb8b458bb3bffe0943c602073002573 - sha256sums = e97e871bc59b35dcd437106a1cc933d7948c64b652065a597911aa64f3b8338d + sha256sums = c46a2e650032a0dc07befca3e293ef22c1722e60436df1ee422eff73727d33dd + sha256sums = 69dd8ededd2b90f27f56ee9a0873a932ff01f33712f602b26afd9170aaa7cd83 sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21 sha256sums = f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c - sha256sums = 884a2ca2f7dae9783265fc08d0b871a8850f9c761377a1a0716ca5b3272674d2 + sha256sums = d0225e14dd3f619bf6540df134b5545e13bfb0954616a329c48d5eb768862eda sha256sums = 04d2a47524cbd132aad2fd310d56515a29310a2e693ba94ce12c65cd776a70d2 sha256sums = 22690e393ee89703b17898038aaa37900805104e8c960b346fe1f6050edc9bce - sha256sums = dbcdd9203a293b00e95d9dcc39fe170c853f698428193e32b8f048e87ab57af8 + sha256sums = efac7e7f31af0020f35aa026c6231fbf8dd56124832b8d60c3fcde126ca24cab sha256sums = 2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d sha256sums = d2396e827bb573ba23611ed0d1668e0af86d4105bed8af5ffb43646b0f42958b sha256sums = a2d53dbda08b79f2280d08b4d3b47694b41cf2508d3b508760f332d9e96ab752 @@ -103,14 +103,14 @@ package() { } sha256sums=('f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731' - 'e865cf10831a1e0cb2a615b4b97330bdeeb8b458bb3bffe0943c602073002573' - 'e97e871bc59b35dcd437106a1cc933d7948c64b652065a597911aa64f3b8338d' + 'c46a2e650032a0dc07befca3e293ef22c1722e60436df1ee422eff73727d33dd' + '69dd8ededd2b90f27f56ee9a0873a932ff01f33712f602b26afd9170aaa7cd83' '80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21' 'f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c' - '884a2ca2f7dae9783265fc08d0b871a8850f9c761377a1a0716ca5b3272674d2' + 'd0225e14dd3f619bf6540df134b5545e13bfb0954616a329c48d5eb768862eda' '04d2a47524cbd132aad2fd310d56515a29310a2e693ba94ce12c65cd776a70d2' '22690e393ee89703b17898038aaa37900805104e8c960b346fe1f6050edc9bce' - 'dbcdd9203a293b00e95d9dcc39fe170c853f698428193e32b8f048e87ab57af8' + 'efac7e7f31af0020f35aa026c6231fbf8dd56124832b8d60c3fcde126ca24cab' '2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d' 'd2396e827bb573ba23611ed0d1668e0af86d4105bed8af5ffb43646b0f42958b' 'a2d53dbda08b79f2280d08b4d3b47694b41cf2508d3b508760f332d9e96ab752' diff --git a/evelauncher.sh b/evelauncher.sh index 30bc0a8c7c09..03d264618cf3 100644 --- a/evelauncher.sh +++ b/evelauncher.sh @@ -45,7 +45,7 @@ check_wine() { UCW=$(grep UseCustomWine $EVECONF | cut -d= -f2) if [ "x$UCW" = "xtrue" ] ;then CUSTOMWP=$(grep CustomWinePath $EVECONF | cut -d= -f2) - WINEPATH="${CUSTOMWP%/*}" + WINEPATH=${CUSTOMWP%/*} SHAREDIR=$(grep SharedCacheFolder $EVECONF | cut -d= -f2) WINEPREFIX=${SHAREDIR}wineenv else @@ -54,8 +54,8 @@ check_wine() { fi if [ -x "$WINEPATH/wine" ] ;then INSTWINE=$(cat $WINEPREFIX/.update-timestamp 2>/dev/null) || true - WINEPATH=$(readlink -f "$CUSTOMWP") - WINECONF=$(find "${WINEPATH%/bin*}"/share -name 'wine.inf' 2>/dev/null) || true + WINEINFP=$(readlink -f $CUSTOMWP) + 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" @@ -63,15 +63,15 @@ check_wine() { WINEPREFIX=$WINEPREFIX \ WINEDEBUG=-all \ WINEDLLOVERRIDES="mscoree,mshtml,winemenubuilder.exe=d" \ - "$WINEPATH/wine" wineboot - env WINEPREFIX=$WINEPREFIX "$WINEPATH/wine" reg delete \ + $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 \ + 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" \ + if [ $($WINEPATH/wine --version | grep -q 3.2 ;echo $?) != 0 ] ;then + env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \ $(which winetricks) -q winxp >/dev/null fi fi diff --git a/evelauncher.sh.in b/evelauncher.sh.in index f7806816d972..1dc9908d1efb 100644 --- a/evelauncher.sh.in +++ b/evelauncher.sh.in @@ -56,7 +56,7 @@ check_wine() { UCW=$(grep UseCustomWine $EVECONF | cut -d= -f2) if [ "x$UCW" = "xtrue" ] ;then CUSTOMWP=$(grep CustomWinePath $EVECONF | cut -d= -f2) - WINEPATH="${CUSTOMWP%/*}" + WINEPATH=${CUSTOMWP%/*} SHAREDIR=$(grep SharedCacheFolder $EVECONF | cut -d= -f2) WINEPREFIX=${SHAREDIR}wineenv else @@ -65,24 +65,24 @@ check_wine() { fi if [ -x "$WINEPATH/wine" ] ;then INSTWINE=$(cat $WINEPREFIX/.update-timestamp 2>/dev/null) || true - WINEPATH=$(readlink -f "$CUSTOMWP") - WINECONF=$(find "${WINEPATH%/bin*}"/share -name 'wine.inf' 2>/dev/null) || true - WINEDATE=$(ls -l --time-style=+%s "$WINECONF" 2>/dev/null | cut -d' ' -f6) + WINEINFP=$(readlink -f $CUSTOMWP) + 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" env WINEARCH=win32 \ WINEPREFIX=$WINEPREFIX \ WINEDEBUG=-all \ WINEDLLOVERRIDES="mscoree,mshtml,winemenubuilder.exe=d" \ - "$WINEPATH/wine" wineboot - env WINEPREFIX=$WINEPREFIX "$WINEPATH/wine" reg delete \ + $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 \ + 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" \ + if [ $($WINEPATH/wine --version | grep -q 3.2 ;echo $?) != 0 ] ;then + env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \ $(which winetricks) -q winxp >/dev/null fi fi @@ -4,7 +4,7 @@ EVECONF=$HOME/.config/CCP/EVE.conf UCW=$(grep UseCustomWine $EVECONF | cut -d= -f2) if [ "x$UCW" = "xtrue" ] ;then CUSTOMWP=$(grep CustomWinePath $EVECONF | cut -d= -f2) - WINEPATH="${CUSTOMWP%/*}" + WINEPATH=${CUSTOMWP%/*} SHAREDIR=$(grep SharedCacheFolder $EVECONF | cut -d= -f2) WINEPREFIX=${SHAREDIR}wineenv else @@ -18,12 +18,12 @@ if [ ! -x "$WINEPATH/wine" ] ;then fi if [ -x "$WINEPATH/${0#*eve}" ] ;then - WINECMD="$WINEPATH/${0#*eve}" + WINECMD=$WINEPATH/${0#*eve} else - WINECMD="$CUSTOMWP ${0#*eve}" + WINECMD=$CUSTOMWP\ ${0#*eve} fi env WINEPREFIX=$WINEPREFIX \ WINEDEBUG=-all \ WINEDLLOVERRIDES="mscoree,mshtml,winemenubuilder.exe=d" \ - "$WINECMD" "$@" + $WINECMD "$@" diff --git a/evewinetricks b/evewinetricks index 1d41763be081..6a6141e67b08 100644 --- a/evewinetricks +++ b/evewinetricks @@ -4,7 +4,7 @@ EVECONF=$HOME/.config/CCP/EVE.conf UCW=$(grep UseCustomWine $EVECONF | cut -d= -f2) if [ "x$UCW" = "xtrue" ] ;then CUSTOMWP=$(grep CustomWinePath $EVECONF | cut -d= -f2) - WINEPATH="${CUSTOMWP%/*}" + WINEPATH=${CUSTOMWP%/*} SHAREDIR=$(grep SharedCacheFolder $EVECONF | cut -d= -f2) WINEPREFIX=${SHAREDIR}wineenv else @@ -17,4 +17,4 @@ if [ ! -x "$WINEPATH/wine" ] ;then fi env WINEPREFIX=$WINEPREFIX \ - WINE="$WINEPATH/wine" $(which winetricks) "$@" + WINE=$WINEPATH/wine $(which winetricks) "$@" |