diff options
| author | Jernuh Zakalwe | 2018-10-26 14:58:20 +0200 |
|---|---|---|
| committer | Jernuh Zakalwe | 2018-10-26 14:58:20 +0200 |
| commit | ee7f270348f9e29f09aa91a30fe3010be05616cb (patch) | |
| tree | 236f89d22811524295655494294ac6c8affcb253 | |
| parent | fb836635a8a506abc23fcc9a75970312a0660706 (diff) | |
| download | aur-ee7f270348f9e29f09aa91a30fe3010be05616cb.tar.gz | |
build_installer.sh:
Remove test sections in setup.sh before creating .run file.
Pack format changed from xz to gz to speedup build process.
evelauncher.sh:
Using real $WINEPATH/wineserver for checking wine build.
Using internal wineboot command via wine.
evewine:
Changed handling from internal wine commands to be more robust and extendable.
setup.sh:
Mark test sections to be easier to remove or activate.
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rwxr-xr-x | build_installer.sh | 4 | ||||
| -rw-r--r-- | evelauncher.sh | 4 | ||||
| -rw-r--r-- | evelauncher.sh.in | 4 | ||||
| -rw-r--r-- | evewine | 8 | ||||
| -rw-r--r-- | setup.sh.in | 12 |
7 files changed, 29 insertions, 23 deletions
@@ -47,17 +47,17 @@ 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 = 81b3ffe24ec3732132f28bdb738c30f1e44d28a08f7e039fe698b97cc049e501 - sha256sums = 1e4e6328e38b4a2b21b1d0c613160c74ebc177521a0c5de3d4cd929c07d8bef5 + sha256sums = 7c8e25d4a9d89f642f02dad88769db59885b9852cac85106c1c4153a84796471 + sha256sums = 87f9e2e99119b042ae98b626d57a1837c412a443e3b54dfa2be17121c0b78605 sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21 sha256sums = f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c - sha256sums = f0fef94e2963138ee68a736376a29513426b415aa43fcba8794322778f62c939 + sha256sums = 5a3b4058bde3752d079e2bcb2c5f3bc1cef0e34fe6763ea7632ef65b328f6610 sha256sums = 04d2a47524cbd132aad2fd310d56515a29310a2e693ba94ce12c65cd776a70d2 sha256sums = 22690e393ee89703b17898038aaa37900805104e8c960b346fe1f6050edc9bce sha256sums = efac7e7f31af0020f35aa026c6231fbf8dd56124832b8d60c3fcde126ca24cab sha256sums = 2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d - sha256sums = bf7ec44e01b396c8b690f239e25d17f81555f6a2024e7b119ecdcf125d612495 - sha256sums = ab2c35d9a451a545f973efda55a34bbcbb53fb8031a9625e68bc7bb005fde9e1 + sha256sums = 9931c5dcea93cd1e2a72754b35d8f994cdea8b146495991d4050987864e7b9a1 + sha256sums = a2d53dbda08b79f2280d08b4d3b47694b41cf2508d3b508760f332d9e96ab752 sha256sums = 2c192fdc282fefafee5596b60bd1779668b611d386e2bf933eef51d39eac7a28 sha256sums = 47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a sha256sums = 1c3df28324c8498e34d2e789fd1f36577afa5a31bdbb278d752f7ef8c6ec5516 @@ -100,17 +100,17 @@ package() { } sha256sums=('f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731' - '81b3ffe24ec3732132f28bdb738c30f1e44d28a08f7e039fe698b97cc049e501' - '1e4e6328e38b4a2b21b1d0c613160c74ebc177521a0c5de3d4cd929c07d8bef5' + '7c8e25d4a9d89f642f02dad88769db59885b9852cac85106c1c4153a84796471' + '87f9e2e99119b042ae98b626d57a1837c412a443e3b54dfa2be17121c0b78605' '80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21' 'f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c' - 'f0fef94e2963138ee68a736376a29513426b415aa43fcba8794322778f62c939' + '5a3b4058bde3752d079e2bcb2c5f3bc1cef0e34fe6763ea7632ef65b328f6610' '04d2a47524cbd132aad2fd310d56515a29310a2e693ba94ce12c65cd776a70d2' '22690e393ee89703b17898038aaa37900805104e8c960b346fe1f6050edc9bce' 'efac7e7f31af0020f35aa026c6231fbf8dd56124832b8d60c3fcde126ca24cab' '2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d' - 'bf7ec44e01b396c8b690f239e25d17f81555f6a2024e7b119ecdcf125d612495' - 'ab2c35d9a451a545f973efda55a34bbcbb53fb8031a9625e68bc7bb005fde9e1' + '9931c5dcea93cd1e2a72754b35d8f994cdea8b146495991d4050987864e7b9a1' + 'a2d53dbda08b79f2280d08b4d3b47694b41cf2508d3b508760f332d9e96ab752' '2c192fdc282fefafee5596b60bd1779668b611d386e2bf933eef51d39eac7a28' '47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a' '1c3df28324c8498e34d2e789fd1f36577afa5a31bdbb278d752f7ef8c6ec5516' diff --git a/build_installer.sh b/build_installer.sh index ffb8fd68965e..c9fc3567aa21 100755 --- a/build_installer.sh +++ b/build_installer.sh @@ -41,7 +41,7 @@ for cmd in evelauncher.sh everegedit evewine evewinecfg evewinetricks ;do fi done cp -f ../evelauncher.sh.in evesetup/evelauncher.sh -cp ../setup.sh.in evesetup/setup.sh +grep -v '^#-' ../setup.sh.in >evesetup/setup.sh chmod a+x evesetup/setup.sh echo "done." @@ -81,7 +81,7 @@ rm -rf evelauncher/ echo "done." printf "\nBuild self-extractable archive evesetup-$version-$release-$arch.run\n\n" -./makeself.sh --xz evesetup/ ../evesetup-$version-$release-$arch.run \ +./makeself.sh evesetup/ ../evesetup-$version-$release-$arch.run \ "EVE Online Launcher Setup" ./setup.sh cd .. printf "\nClean up build environment..." diff --git a/evelauncher.sh b/evelauncher.sh index e1d93c2045b1..bfd497d51ac9 100644 --- a/evelauncher.sh +++ b/evelauncher.sh @@ -62,10 +62,10 @@ check_wine() { WINEPREFIX=$WINEPREFIX \ WINEDEBUG=-all \ WINEDLLOVERRIDES="mscoree,mshtml,winemenubuilder.exe=d" \ - $WINEPATH/wineboot + $WINEPATH/wine wineboot env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg delete \ 'HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\RunServices' \ - /v winemenubuilder /f >/dev/null + /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 diff --git a/evelauncher.sh.in b/evelauncher.sh.in index c50e6bd3a923..43e62ea3a079 100644 --- a/evelauncher.sh.in +++ b/evelauncher.sh.in @@ -73,10 +73,10 @@ check_wine() { WINEPREFIX=$WINEPREFIX \ WINEDEBUG=-all \ WINEDLLOVERRIDES="mscoree,mshtml,winemenubuilder.exe=d" \ - $WINEPATH/wineboot + $WINEPATH/wine wineboot env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg delete \ 'HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\RunServices' \ - /v winemenubuilder /f >/dev/null + /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 @@ -17,7 +17,13 @@ if [ ! -x "$WINEPATH/wine" ] ;then exit 1 fi +if [ -x "$WINEPATH/${0#*eve}" ] ;then + WINECMD="$WINEPATH/${0#*eve}" +else + WINECMD="$CUSTOMWP ${0#*eve}" +fi + env WINEPREFIX=$WINEPREFIX \ WINEDEBUG=-all \ WINEDLLOVERRIDES="mscoree,mshtml,winemenubuilder.exe=d" \ - $WINEPATH/${0#*eve} "$@" + $WINECMD "$@" diff --git a/setup.sh.in b/setup.sh.in index c08fff1eddbb..ebff4c156872 100644 --- a/setup.sh.in +++ b/setup.sh.in @@ -31,12 +31,12 @@ bootstrap_install() { ln -s "${target}/bin/$cmd" "${prefix}/bin/$cmd" if [ ! "$cmd" = "evewine" ] ;then #-- testing only -# oexec=$(grep Exec= ./${cmd%.*}.desktop) -# sed -i s,$oexec,Exec=$prefix/bin/$cmd, ./${cmd%.*}.desktop +#- oexec=$(grep Exec= ./${cmd%.*}.desktop) +#- sed -i s,$oexec,Exec=$prefix/bin/$cmd, ./${cmd%.*}.desktop #-- install -m 0644 "./${cmd%.*}.desktop" "${prefix}/share/applications/" #-- testing only -# sed -i s,Exec=$prefix/bin/$cmd,$oexec, ./${cmd%.*}.desktop +#- sed -i s,Exec=$prefix/bin/$cmd,$oexec, ./${cmd%.*}.desktop #-- fi done @@ -93,8 +93,8 @@ if [ -d "${target}/bin/" ] ;then bootstrap_remove else #-- testing only -# otarget=$(grep ^SETUPDIR= ./evelauncher.sh) -# sed -i s,$otarget,SETUPDIR=\"$target\", ./evelauncher.sh +#- otarget=$(grep ^SETUPDIR= ./evelauncher.sh) +#- sed -i s,$otarget,SETUPDIR=\"$target\", ./evelauncher.sh #-- printf "\n" read -p 'Install EVE Online Launcher Setup? (Y/n) ' key @@ -103,7 +103,7 @@ else printf "\nYou can now start EVE Online Launcher and his " && \ echo "Tools from your Application menu." #-- testing only -# sed -i s,SETUPDIR=\"$target\",$otarget, ./evelauncher.sh +#- sed -i s,SETUPDIR=\"$target\",$otarget, ./evelauncher.sh #-- fi printf "\nDone.\n\n" |