diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rwxr-xr-x | build_lite_installer.sh | 1 | ||||
| -rw-r--r-- | evesetup.shlib | 63 | ||||
| -rw-r--r-- | setup.sh.in | 3 | ||||
| -rw-r--r-- | setup_lite.sh.in | 2 |
6 files changed, 44 insertions, 51 deletions
@@ -1,10 +1,10 @@ pkgbase = evesetup pkgdesc = An inofficial EVE Online Launcher Setup Tool. pkgver = 1747682 - pkgrel = 5 + pkgrel = 6 url = https://forums.eveonline.com/t/eve-installing/71494 arch = x86_64 - license = zlib/png + license = zlib depends = icu depends = openssl depends = openssl-1.0 @@ -64,7 +64,7 @@ pkgbase = evesetup sha256sums = 29b6f2cda542c8f3f3845fb3e1ff3e9ac2a645d389c1618bdac5fa69947a2b4b sha256sums = 7c658874857586e70d5b727895905c884cf6aa7b1d172f3811ab62bec52d98c4 sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21 - sha256sums = 307563dc60b291b9dc5146bd92521ee9e13bad0bd54852661cd89c5445f63352 + sha256sums = 3502adff0365f59e8149240982d73b721b045ff5dfccf8d07fad7655b86dbd88 sha256sums = a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b sha256sums = 9079fd9ed7967479b7a78643d43537c04f9275303cd713651d2481bf4c658653 sha256sums = 546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd @@ -76,9 +76,9 @@ pkgbase = evesetup sha256sums = 528fc6627e8893db5d7092194e9f3320067f2f1f4593a206aee8a5207956e563 sha256sums = d4610df883778f91e0ea5feba84720dfe814af0b9960677e3861809d70de24b2 sha256sums = cda0f7cf511a527645a8a8f4d041888db34d03372a9a45bdecc2eb19133301b0 - sha256sums = 18d624c454b452c4d39013c689f8f122774354657a320118601f11df942c15d8 - sha256sums = f9b0f0fbf5ce9aab2ca23f35055fad25a4b6759351b9a0b2754e592b733a42c5 - sha256sums = d44fe163efaba5df1d27d831690e31a5b1da1619cf202cc9e296527373cecb44 + sha256sums = 1f07f0fac8dbdc1e6d4983e633dc53084b46146a590708122671e8008d349d9f + sha256sums = 68e1ace4ae7b790c44e0ec9bd90445acc2b3c607076473c1aa2b746209c8fbf1 + sha256sums = 7fc6a38efa040fb76aecc4cc4d003110a5a32847a7e82907beff34b5046b2d91 sha256sums = 69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3 sha256sums = 762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422 sha256sums = 980d68abd6f4a662b69efd19145112e88f349044fa1ed5cb6d0a840a92cb42e4 @@ -1,11 +1,11 @@ #Maintainer: Jernuh Zakalwe <jzakalwe1st@gmail.com> pkgname=evesetup pkgver=1747682 -pkgrel=5 +pkgrel=6 pkgdesc="An inofficial EVE Online Launcher Setup Tool." arch=(x86_64) url="https://forums.eveonline.com/t/eve-installing/71494" -license=('zlib/png') +license=('zlib') depends=('icu' 'openssl' @@ -99,7 +99,7 @@ package() { cp ${srcdir}/evelauncher.kwinrule ${pkgdir}/opt/${pkgname}/doc cp -r ${srcdir}/dxvk-1.7.1/x32 ${pkgdir}/opt/${pkgname}/lib/dxvk/ cp -r ${srcdir}/dxvk-1.7.1/x64 ${pkgdir}/opt/${pkgname}/lib/dxvk/ - echo "dxvk-1.7.1" >${pkgdir}/opt/${pkgname}/lib/dxvk/version + echo "1.7.1" >${pkgdir}/opt/${pkgname}/lib/dxvk/version cp -r ${srcdir}/icons ${pkgdir}/usr/share/ rm -rf ${srcdir}/evelauncher/resources/ ${srcdir}/evelauncher/plugins/ rm -f ${srcdir}/evelauncher/*[Qq]t* ${srcdir}/evelauncher/libcrypto* @@ -128,7 +128,7 @@ sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4' '29b6f2cda542c8f3f3845fb3e1ff3e9ac2a645d389c1618bdac5fa69947a2b4b' '7c658874857586e70d5b727895905c884cf6aa7b1d172f3811ab62bec52d98c4' '80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21' - '307563dc60b291b9dc5146bd92521ee9e13bad0bd54852661cd89c5445f63352' + '3502adff0365f59e8149240982d73b721b045ff5dfccf8d07fad7655b86dbd88' 'a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b' '9079fd9ed7967479b7a78643d43537c04f9275303cd713651d2481bf4c658653' '546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd' @@ -140,9 +140,9 @@ sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4' '528fc6627e8893db5d7092194e9f3320067f2f1f4593a206aee8a5207956e563' 'd4610df883778f91e0ea5feba84720dfe814af0b9960677e3861809d70de24b2' 'cda0f7cf511a527645a8a8f4d041888db34d03372a9a45bdecc2eb19133301b0' - '18d624c454b452c4d39013c689f8f122774354657a320118601f11df942c15d8' - 'f9b0f0fbf5ce9aab2ca23f35055fad25a4b6759351b9a0b2754e592b733a42c5' - 'd44fe163efaba5df1d27d831690e31a5b1da1619cf202cc9e296527373cecb44' + '1f07f0fac8dbdc1e6d4983e633dc53084b46146a590708122671e8008d349d9f' + '68e1ace4ae7b790c44e0ec9bd90445acc2b3c607076473c1aa2b746209c8fbf1' + '7fc6a38efa040fb76aecc4cc4d003110a5a32847a7e82907beff34b5046b2d91' '69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3' '762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422' '980d68abd6f4a662b69efd19145112e88f349044fa1ed5cb6d0a840a92cb42e4' diff --git a/build_lite_installer.sh b/build_lite_installer.sh index 210090776813..c44c5345f3a8 100755 --- a/build_lite_installer.sh +++ b/build_lite_installer.sh @@ -138,7 +138,6 @@ find ./ -maxdepth 1 -type f -exec strip -s {} 2>/dev/null \; echo "done." printf "\nRepack evelauncher-$version.tar.gz..." -touch ./* cd ../ tar czf evesetup/evelauncher-$version.tar.gz evelauncher/ echo "done." diff --git a/evesetup.shlib b/evesetup.shlib index 16b9056c5324..bb55f5e97b70 100644 --- a/evesetup.shlib +++ b/evesetup.shlib @@ -6,32 +6,30 @@ SHAREDIR="$HOME/.eve" check_elv() { ELBIN=$(getdate $LAUNCHER/evelauncher) - ELBIN=$(expr $ELBIN / 180 \* 180) ELARC=$(getdate $SETUPDIR/lib/evelauncher-$ELVER.tar.?z) - ELARC=$(expr $ELARC / 180 \* 180) if [ "$ELBIN" -lt "$ELARC" ] ;then if [ -d "$LAUNCHER" ] ;then rm -rf $LAUNCHER desktop_msg "Update EVE Launcher binaries" fi - tar xf $SETUPDIR/lib/evelauncher-$ELVER.tar.?z -C $EVEDIR + tar xmf $SETUPDIR/lib/evelauncher-$ELVER.tar.?z -C $EVEDIR mv $EVEDIR/evelauncher $LAUNCHER if [ -f "$HOME/.config/devilspie2/evelauncher.lua" ] ;then - sed -i 2\ s,[0-9].*\",$ELVER\", \ - $HOME/.config/devilspie2/evelauncher.lua + sed -i 2\ s,[0-9].*\",$ELVER\", $HOME/.config/devilspie2/evelauncher.lua fi + for ELCACHE in $HOME/.cache $HOME/.local/share ;do + if [ -d "$ELCACHE/CCP/EVE/QtWebEngine" ] ;then + rm -rf $ELCACHE/CCP/EVE/QtWebEngine + fi + done fi } check_env() { - if [ -d "$CONFDIR" ] ;then - if [ -r "$EVECONF" ] ;then - SHAREDIR=$(getval SharedCacheFolder) - fi - fi - [ ! -d "$SHAREDIR" ] && SHAREDIR="" + if [ -r "$EVECONF" ] ;then SHAREDIR=$(getval SharedCacheFolder) ;fi + if [ ! -d "$SHAREDIR" ] ;then SHAREDIR="" ;fi if [ "x$SHAREDIR" != "x$EVEDIR/SharedCache/" ] ;then - desktop_msg "Please wait, preparing environment in $EVEDIR" + desktop_msg "Please wait, prepare environment in $EVEDIR" mkdir -p $CONFDIR echo "[General]" >$EVECONF echo "SharedCacheFolder=$EVEDIR/SharedCache/" >>$EVECONF @@ -56,10 +54,14 @@ check_wine() { CUSTOMWP=$(getval CustomWinePath) SHAREDIR=$(getval SharedCacheFolder) UCW=$(getval UseCustomWine) + DXVKLIBDIR=$SETUPDIR/lib/dxvk + DXVKFILELIST="d3d10core d3d11 d3d9 dxgi" WINEPREFIX=${SHAREDIR}wineenv - if [ "x$UCW" = "xtrue" ] ;then + WINSYSDIR=$WINEPREFIX/drive_c/windows/system32 + W32SYSDIR=${WINSYSDIR%/*}/syswow64 + if [ "$UCW" = "true" ] ;then WINEPATH=${CUSTOMWP%/*} - [ -d "${SHAREDIR}wine" ] && rm -rf ${SHAREDIR}wine + if [ -d "${SHAREDIR}wine" ] ;then rm -rf ${SHAREDIR}wine ;fi else CUSTOMWP=${SHAREDIR}wine WINEPATH=${SHAREDIR}wine/bin @@ -73,21 +75,12 @@ check_wine() { desktop_msg "ERROR: \"$CUSTOMWP\" not found!" exit 1 fi - DXVKLIBDIR=$SETUPDIR/lib/dxvk - DXVKFILELIST="d3d10core d3d11 dxgi" - WINSYSDIR=$WINEPREFIX/drive_c/windows/system32 - W32SYSDIR=${WINSYSDIR%/*}/syswow64 - INSTWINE=$(cat $WINEPREFIX/.update-timestamp | tr -dc [:digit:]) || true + INSTWINE=$(tr -dc [:digit:] 2>/dev/null < $WINEPREFIX/.update-timestamp || printf 0) WINEINFP=$(readlink -f $CUSTOMWP) WINECONF=$(find ${WINEINFP%bin*}share/wine* -name 'wine.inf') WINEDATE=$(getdate $WINECONF) - if [ "x$WINEDATE" != "x$INSTWINE" ] ;then + if [ "$WINEDATE" != "$INSTWINE" ] ;then desktop_msg "Prepare wine environment for EVE" - for DXVKFILE in d3d10_1 d3d10core d3d10 d3d11 d3d9 dxgi ;do - rm $WINSYSDIR/$DXVKFILE.dll* || true - rm $W32SYSDIR/$DXVKFILE.dll* || true - sed -i /\"$DXVKFILE\"=\"/d $WINEPREFIX/user.reg || true - done env WINEPREFIX=$WINEPREFIX \ WINEDEBUG=-all \ WINEDLLOVERRIDES="mscoree,mshtml=d" \ @@ -96,20 +89,24 @@ check_wine() { $WINE reg add \ 'HKCU\Software\Wine\FileOpenAssociations' \ /v Enable /d N /f >/dev/null - if [ -d "$DXVKLIBDIR" ] ;then + fi + if [ -d "$DXVKLIBDIR" ] ;then + DXVKARC=$(getdate $DXVKLIBDIR/x64/d3d11.dll) + INSTDX=$(getdate $WINSYSDIR/d3d11.dll) + if [ "$INSTDX" != "$DXVKARC" ] ;then for DXVKFILE in $DXVKFILELIST ;do - cp $DXVKLIBDIR/x64/$DXVKFILE.dll $WINSYSDIR/$DXVKFILE.dll + cp --preserve=timestamps $DXVKLIBDIR/x64/$DXVKFILE.dll $WINSYSDIR/$DXVKFILE.dll if [ -d "$W32SYSDIR" ] ;then - cp $DXVKLIBDIR/x32/$DXVKFILE.dll $W32SYSDIR/$DXVKFILE.dll + cp --preserve=timestamps $DXVKLIBDIR/x32/$DXVKFILE.dll $W32SYSDIR/$DXVKFILE.dll fi env WINEPREFIX=$WINEPREFIX \ $WINE reg add \ 'HKCU\Software\Wine\DllOverrides' \ - /v $DXVKFILE /d native >/dev/null + /v $DXVKFILE /d native /f >/dev/null done fi fi - if [ "x$(grep -csw winemenubuilder $WINEPREFIX/system.reg)" != "x0" ] ;then + if [ "$(grep -csw winemenubuilder $WINEPREFIX/system.reg)" != "0" ] ;then env WINEPREFIX=$WINEPREFIX \ $WINE reg delete \ 'HKLM\Software\Microsoft\Windows\CurrentVersion\RunServices' \ @@ -118,14 +115,12 @@ check_wine() { } desktop_msg() { - if [ -x "$(which notify-send)" ] ;then - notify-send -i eve $(basename $0) "$@" - fi + if [ -x "$(which notify-send)" ] ;then notify-send -i eve $(basename $0) "$@" ;fi printf "$(basename $0): $@\n" } getdate() { - printf $(ls -l --time-style=+%s $1 | cut -d' ' -f6) || printf 180 + printf $(ls -l --time-style=+%s $1 | cut -d' ' -f6) || printf 0 } getval() { diff --git a/setup.sh.in b/setup.sh.in index 0594b1bd083d..58206a09726b 100644 --- a/setup.sh.in +++ b/setup.sh.in @@ -14,7 +14,7 @@ bootstrap_install() { done if [ -f "./dxvk-$dvver.tar.gz" ] ;then install -d "$libdir/dxvk/" - echo "dxvk-$dvver" >"$libdir/dxvk/version" + echo "$dvver" >"$libdir/dxvk/version" chmod 0644 "$libdir/dxvk/version" tar xf ./dxvk-$dvver.tar.gz -C $libdir/dxvk/ --no-same-owner \ --strip-components=1 dxvk-$dvver/x32 dxvk-$dvver/x64 @@ -113,7 +113,6 @@ build_lib() { find ./ -maxdepth 1 -type f -exec strip -s {} 2>/dev/null \; echo "done." printf "\nRepack evelauncher-$elver.tar.gz..." - touch ./* cd ../ rm evelauncher-$elver.tar.gz tar czf evelauncher-$elver.tar.gz evelauncher/ diff --git a/setup_lite.sh.in b/setup_lite.sh.in index 5983aecfa7f3..b6efd6097261 100644 --- a/setup_lite.sh.in +++ b/setup_lite.sh.in @@ -11,7 +11,7 @@ bootstrap_install() { install -d "$prefix/share/applications/" if [ -f "./dxvk-$dvver.tar.gz" ] ;then install -d "$libdir/dxvk/" - echo "dxvk-$dvver" >"$libdir/dxvk/version" + echo "$dvver" >"$libdir/dxvk/version" chmod 0644 "$libdir/dxvk/version" tar xf ./dxvk-$dvver.tar.gz -C $libdir/dxvk/ --no-same-owner \ --strip-components=1 dxvk-$dvver/x32 dxvk-$dvver/x64 |