diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rwxr-xr-x | build_installer.sh | 20 | ||||
| -rw-r--r-- | evelauncher.sh | 3 | ||||
| -rw-r--r-- | evelauncher.sh.in | 3 |
5 files changed, 21 insertions, 17 deletions
@@ -47,8 +47,8 @@ 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 = bd00eb9884f858f6f89ca4d84ac0ad3561e0c93f730ba0336d7df18bf2d21d82 - sha256sums = 6d0822615ed29b8ff5b179f2561a034874115e736d034f4103b5ef4864734801 + sha256sums = 81b3ffe24ec3732132f28bdb738c30f1e44d28a08f7e039fe698b97cc049e501 + sha256sums = 1e4e6328e38b4a2b21b1d0c613160c74ebc177521a0c5de3d4cd929c07d8bef5 sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21 sha256sums = f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c sha256sums = f0fef94e2963138ee68a736376a29513426b415aa43fcba8794322778f62c939 @@ -56,7 +56,7 @@ pkgbase = evesetup sha256sums = 22690e393ee89703b17898038aaa37900805104e8c960b346fe1f6050edc9bce sha256sums = efac7e7f31af0020f35aa026c6231fbf8dd56124832b8d60c3fcde126ca24cab sha256sums = 2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d - sha256sums = 1f490852b26b3580e291761946775016dd1c06f2a49cb552e255520d73c23916 + sha256sums = bf7ec44e01b396c8b690f239e25d17f81555f6a2024e7b119ecdcf125d612495 sha256sums = ab2c35d9a451a545f973efda55a34bbcbb53fb8031a9625e68bc7bb005fde9e1 sha256sums = 2c192fdc282fefafee5596b60bd1779668b611d386e2bf933eef51d39eac7a28 sha256sums = 47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a @@ -100,8 +100,8 @@ package() { } sha256sums=('f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731' - 'bd00eb9884f858f6f89ca4d84ac0ad3561e0c93f730ba0336d7df18bf2d21d82' - '6d0822615ed29b8ff5b179f2561a034874115e736d034f4103b5ef4864734801' + '81b3ffe24ec3732132f28bdb738c30f1e44d28a08f7e039fe698b97cc049e501' + '1e4e6328e38b4a2b21b1d0c613160c74ebc177521a0c5de3d4cd929c07d8bef5' '80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21' 'f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c' 'f0fef94e2963138ee68a736376a29513426b415aa43fcba8794322778f62c939' @@ -109,7 +109,7 @@ sha256sums=('f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731' '22690e393ee89703b17898038aaa37900805104e8c960b346fe1f6050edc9bce' 'efac7e7f31af0020f35aa026c6231fbf8dd56124832b8d60c3fcde126ca24cab' '2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d' - '1f490852b26b3580e291761946775016dd1c06f2a49cb552e255520d73c23916' + 'bf7ec44e01b396c8b690f239e25d17f81555f6a2024e7b119ecdcf125d612495' 'ab2c35d9a451a545f973efda55a34bbcbb53fb8031a9625e68bc7bb005fde9e1' '2c192fdc282fefafee5596b60bd1779668b611d386e2bf933eef51d39eac7a28' '47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a' diff --git a/build_installer.sh b/build_installer.sh index 136aedf3a797..ffb8fd68965e 100755 --- a/build_installer.sh +++ b/build_installer.sh @@ -9,13 +9,19 @@ version=$(grep ^pkgver PKGBUILD | cut -d= -f2) || exit 1 release=$(grep ^pkgrel PKGBUILD | cut -d= -f2) || exit 1 arch=$(uname -m) -printf "\nCreate clean build environment..." -if [ -d src/ ] ;then rm -rf src/* ;else mkdir src/ ;fi - if [ ! -f "makeself-2.4.0.run" ] ;then +printf "\nGet makeself...\n\n" curl -L -O https://github.com/megastep/makeself/releases/download/release-2.4.0/makeself-2.4.0.run fi +if [ ! -f "evelauncher-$version.tar.gz" ] ;then +printf "\nGet evelauncher-$version.tar.gz...\n\n" + curl -L -O https://binaries.eveonline.com/evelauncher-$version.tar.gz +fi + +printf "\nCreate clean build environment..." +if [ -d src/ ] ;then rm -rf src/* ;else mkdir src/ ;fi + chmod a+x ./makeself-2.4.0.run ./makeself-2.4.0.run --tar x ./makeself.sh ./makeself-header.sh 2>/dev/null chmod a-x ./makeself-2.4.0.run @@ -39,10 +45,6 @@ cp ../setup.sh.in evesetup/setup.sh chmod a+x evesetup/setup.sh echo "done." -if [ ! -r "../evelauncher-$version.tar.gz" ] ;then - curl -L -O https://binaries.eveonline.com/evelauncher-$version.tar.gz -fi - printf "\nExtract evelauncher-$version.tar.gz..." tar xf ../evelauncher-$version.tar.gz echo "done." @@ -75,7 +77,7 @@ printf "\nRepack evelauncher-$version.tar.gz..." cd ../ tar czf evelauncher-$version.tar.gz evelauncher/ mv evelauncher-$version.tar.gz evesetup/ -rm -rf evelauncher/ +rm -rf evelauncher/ echo "done." printf "\nBuild self-extractable archive evesetup-$version-$release-$arch.run\n\n" @@ -83,5 +85,5 @@ printf "\nBuild self-extractable archive evesetup-$version-$release-$arch.run\n\ "EVE Online Launcher Setup" ./setup.sh cd .. printf "\nClean up build environment..." -rm -rf src/* +rm -rf src/ echo "done." diff --git a/evelauncher.sh b/evelauncher.sh index 0772a32d51af..e1d93c2045b1 100644 --- a/evelauncher.sh +++ b/evelauncher.sh @@ -52,7 +52,8 @@ check_wine() { launcher_msg "ERROR: \"Use custom Wine\" not set!" exit 1 fi - WINEDATE=$(ls -l --time-style=+%s $WINEPATH/wineserver | cut -d' ' -f6) + WINESERVER=$(readlink -f $WINEPATH/wineserver) + WINEDATE=$(ls -l --time-style=+%s $WINESERVER | cut -d' ' -f6) INSTWINE=$(cat $WINEPREFIX/.update-timestamp 2>/dev/null) || true if [ "x$WINEDATE" != "x$INSTWINE" ] ;then if [ -x "$WINEPATH/wine" ] ;then diff --git a/evelauncher.sh.in b/evelauncher.sh.in index 5b18bc8dd3d9..c50e6bd3a923 100644 --- a/evelauncher.sh.in +++ b/evelauncher.sh.in @@ -63,7 +63,8 @@ check_wine() { launcher_msg "ERROR: \"Use custom Wine\" not set!" exit 1 fi - WINEDATE=$(ls -l --time-style=+%s $WINEPATH/wineserver | cut -d' ' -f6) + WINESERVER=$(readlink -f $WINEPATH/wineserver) + WINEDATE=$(ls -l --time-style=+%s $WINESERVER | cut -d' ' -f6) INSTWINE=$(cat $WINEPREFIX/.update-timestamp 2>/dev/null) || true if [ "x$WINEDATE" != "x$INSTWINE" ] ;then if [ -x "$WINEPATH/wine" ] ;then |