diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | evesetup.shlib | 2 | ||||
| -rw-r--r-- | setup.sh.in | 23 | ||||
| -rw-r--r-- | setup_lite.sh.in | 5 |
5 files changed, 24 insertions, 22 deletions
@@ -1,7 +1,7 @@ pkgbase = evesetup pkgdesc = An inofficial EVE Online Launcher Setup Tool. pkgver = 1747682 - pkgrel = 2 + pkgrel = 3 url = https://forums.eveonline.com/t/eve-installing/71494 install = evesetup.install arch = x86_64 @@ -65,7 +65,7 @@ pkgbase = evesetup sha256sums = 29b6f2cda542c8f3f3845fb3e1ff3e9ac2a645d389c1618bdac5fa69947a2b4b sha256sums = 7c658874857586e70d5b727895905c884cf6aa7b1d172f3811ab62bec52d98c4 sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21 - sha256sums = 954811cf68bb9e3628efea4aa7606095a032d9ac8225bfdc64c74b1f862a84e5 + sha256sums = 307563dc60b291b9dc5146bd92521ee9e13bad0bd54852661cd89c5445f63352 sha256sums = a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b sha256sums = 9079fd9ed7967479b7a78643d43537c04f9275303cd713651d2481bf4c658653 sha256sums = 546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd @@ -78,8 +78,8 @@ pkgbase = evesetup sha256sums = d4610df883778f91e0ea5feba84720dfe814af0b9960677e3861809d70de24b2 sha256sums = 51eae400033fab0ca0a4a292c9c725dd0da25809d037002130bc1e23fa6c0702 sha256sums = 617349fb5f7ca9071e7d2465f5c0d1e01ad501edf3c2458a2ebcdca33d38b070 - sha256sums = df3740824bf4f8b5c1e2d6d84ef4d4c1eba41127db4d33ea4140491d762a75a8 - sha256sums = ca35e12c37854ef2d4020e06ea945eb15973ed151788ca412f1b3fc5f48bacf8 + sha256sums = ce406f8fe7db143a30a4c85cabfeeb0718c2d4521dc7ad2393743bdc9c9c59ec + sha256sums = 9e88a8eeb2b3a9f2551ab204ee632d1ea03742c57f446ea63c9461c6b927082e sha256sums = 69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3 sha256sums = 762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422 sha256sums = 980d68abd6f4a662b69efd19145112e88f349044fa1ed5cb6d0a840a92cb42e4 @@ -1,7 +1,7 @@ #Maintainer: Jernuh Zakalwe <jzakalwe1st@gmail.com> pkgname=evesetup pkgver=1747682 -pkgrel=2 +pkgrel=3 pkgdesc="An inofficial EVE Online Launcher Setup Tool." arch=(x86_64) url="https://forums.eveonline.com/t/eve-installing/71494" @@ -129,7 +129,7 @@ sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4' '29b6f2cda542c8f3f3845fb3e1ff3e9ac2a645d389c1618bdac5fa69947a2b4b' '7c658874857586e70d5b727895905c884cf6aa7b1d172f3811ab62bec52d98c4' '80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21' - '954811cf68bb9e3628efea4aa7606095a032d9ac8225bfdc64c74b1f862a84e5' + '307563dc60b291b9dc5146bd92521ee9e13bad0bd54852661cd89c5445f63352' 'a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b' '9079fd9ed7967479b7a78643d43537c04f9275303cd713651d2481bf4c658653' '546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd' @@ -142,8 +142,8 @@ sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4' 'd4610df883778f91e0ea5feba84720dfe814af0b9960677e3861809d70de24b2' '51eae400033fab0ca0a4a292c9c725dd0da25809d037002130bc1e23fa6c0702' '617349fb5f7ca9071e7d2465f5c0d1e01ad501edf3c2458a2ebcdca33d38b070' - 'df3740824bf4f8b5c1e2d6d84ef4d4c1eba41127db4d33ea4140491d762a75a8' - 'ca35e12c37854ef2d4020e06ea945eb15973ed151788ca412f1b3fc5f48bacf8' + 'ce406f8fe7db143a30a4c85cabfeeb0718c2d4521dc7ad2393743bdc9c9c59ec' + '9e88a8eeb2b3a9f2551ab204ee632d1ea03742c57f446ea63c9461c6b927082e' '69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3' '762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422' '980d68abd6f4a662b69efd19145112e88f349044fa1ed5cb6d0a840a92cb42e4' diff --git a/evesetup.shlib b/evesetup.shlib index 7bff824d2c6c..16b9056c5324 100644 --- a/evesetup.shlib +++ b/evesetup.shlib @@ -83,7 +83,7 @@ check_wine() { WINEDATE=$(getdate $WINECONF) if [ "x$WINEDATE" != "x$INSTWINE" ] ;then desktop_msg "Prepare wine environment for EVE" - for DXVKFILE in "d3d10_1 d3d10core d3d10 d3d11 d3d9 dxgi" ;do + 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 diff --git a/setup.sh.in b/setup.sh.in index 8b7443cc3610..c5d341957c9f 100644 --- a/setup.sh.in +++ b/setup.sh.in @@ -134,23 +134,22 @@ get_dxvk() { } check_req() { - if [ -x "$(which 7z 2>/dev/null)" ] ;then - printf "\n$(7z | head -n2 | cut -d: -f1 | tr -d [:cntrl:])found." - else - printf "\nError: 7z not found. 7z are needed by evebackup." + if [ ! -r "$(find /usr/lib -type f -name 'libxcb-xinerama*' 2>/dev/null)" ] ;then + printf "\nWarning: libxcb-xinerama needed by evelauncher not found." + printf "\n\tPlease install libxcb-xinerama with your Package Manager.\n" + key="nf" + fi + if [ ! -x "$(which 7z 2>/dev/null)" ] ;then + printf "\nError: 7z needed by evebackup not found." printf "\n\tPlease install p7zip or p7zip-full with your Package Manager.\n" key="nf" fi - if [ -x "$(which curl 2>/dev/null)" ] ;then - printf "\nCurl version $(curl -V | head -n1 | cut -d' ' -f2) found." - else - printf "\n\nError: Curl not found. Curl are needed for downloading evelauncher binaries." + if [ ! -x "$(which curl 2>/dev/null)" ] ;then + printf "\n\nError: Curl needed for downloading evelauncher binaries not found." printf "\n\tPlease install curl with your Package Manager.\n" key="nf" fi - if [ -x "$(which wine 2>/dev/null)" ] ;then - printf "\nWine version $(wine --version) found." - else + if [ ! -x "$(which wine 2>/dev/null)" ] ;then printf "\n\nError: Wine not found." printf "\n\tPlease install wine with your Package Manager." printf "\n\tWineHQ or Developer Version are recommended.\n" @@ -189,7 +188,7 @@ else printf "\n" read -p 'Install EVE Online Launcher Setup? (Y/n) ' key if [ "x$(echo $key | tr [:upper:] [:lower:])" != "xn" ] ;then - printf "\nInstalling...\n\n" + printf "\nInstalling...\n" check_req build_lib get_dxvk diff --git a/setup_lite.sh.in b/setup_lite.sh.in index 76d87ca19e64..66007f2e73b1 100644 --- a/setup_lite.sh.in +++ b/setup_lite.sh.in @@ -66,6 +66,9 @@ bootstrap_remove() { } check_req() { + if [ ! -r "$(find /usr/lib -type f -name 'libxcb-xinerama*' 2>/dev/null)" ] ;then + req="${req}libxcb-xinerama\n" + fi if [ ! -x "$(which 7z 2>/dev/null)" ] ;then req="${req}7z\n" fi @@ -112,7 +115,7 @@ else printf "\n" read -p 'Install EVE Online Launcher Setup? (Y/n) ' key if [ "x$(echo $key | tr [:upper:] [:lower:])" != "xn" ] ;then - printf "\nInstalling...\n\n" + printf "\nInstalling...\n" check_req printf "\n" bootstrap_install |