diff options
author | Jernuh Zakalwe | 2020-07-25 11:20:31 +0200 |
---|---|---|
committer | Jernuh Zakalwe | 2020-07-25 11:20:31 +0200 |
commit | 83b10f9def750b58031764c21fb18c81a0a06c38 (patch) | |
tree | f6a3fb620e90da3f7d45abfe422d87ce2878c970 | |
parent | 983c1e6c58ea20c50620f86def2b7f103dc8139d (diff) | |
download | aur-83b10f9def750b58031764c21fb18c81a0a06c38.tar.gz |
Update to evelauncher version 1747682.
Workaround for missing roots.pem in package install script added.
Translation files to QT version 5.12 updated.
Installation of translations from evelauncher.sh removed.
Independed evelauncher.sh with translation installation added.
-rw-r--r-- | .SRCINFO | 63 | ||||
-rw-r--r-- | PKGBUILD | 85 | ||||
-rwxr-xr-x | build_installer.sh | 4 | ||||
-rw-r--r-- | eve-transl5.11-de.tar.gz | bin | 166123 -> 0 bytes | |||
-rw-r--r-- | eve-transl5.11-en.tar.gz | bin | 129581 -> 0 bytes | |||
-rw-r--r-- | eve-transl5.11-fr.tar.gz | bin | 159377 -> 0 bytes | |||
-rw-r--r-- | eve-transl5.11-ja.tar.gz | bin | 151487 -> 0 bytes | |||
-rw-r--r-- | eve-transl5.11-ru.tar.gz | bin | 173445 -> 0 bytes | |||
-rw-r--r-- | eve-transl5.11-zh.tar.gz | bin | 217501 -> 0 bytes | |||
-rw-r--r-- | eve-transl5.12-de.tar.gz | bin | 0 -> 150164 bytes | |||
-rw-r--r-- | eve-transl5.12-en.tar.gz | bin | 0 -> 135319 bytes | |||
-rw-r--r-- | eve-transl5.12-fr.tar.gz | bin | 0 -> 137587 bytes | |||
-rw-r--r-- | eve-transl5.12-ko.tar.gz | bin | 0 -> 129889 bytes | |||
-rw-r--r-- | eve-transl5.12-ru.tar.gz | bin | 0 -> 159015 bytes | |||
-rw-r--r-- | eve-transl5.12-zh.tar.gz | bin | 0 -> 183644 bytes | |||
-rw-r--r-- | evelauncher.sh | 9 | ||||
-rw-r--r-- | evelauncher.sh.in | 30 | ||||
-rw-r--r-- | evesetup.install | 21 | ||||
-rw-r--r-- | setup.sh.in | 4 |
19 files changed, 140 insertions, 76 deletions
@@ -1,11 +1,22 @@ pkgbase = evesetup pkgdesc = An inofficial EVE Online Launcher Setup Tool. - pkgver = 1548102 - pkgrel = 14 + pkgver = 1747682 + pkgrel = 1 url = https://forums.eveonline.com/t/eve-installing/71494 + install = evesetup.install arch = x86_64 license = custom + depends = icu + depends = openssl + depends = openssl-1.0 depends = p7zip + depends = qt5-base + depends = qt5-declarative + depends = qt5-translations + depends = qt5-location + depends = qt5-webchannel + depends = qt5-webengine + depends = qt5-websockets depends = vulkan-icd-loader depends = wine optdepends = libnotify @@ -13,15 +24,16 @@ pkgbase = evesetup conflicts = evelauncher conflicts = evesetup_dev conflicts = evesetup-beta - noextract = eve-transl5.11-de.tar.gz - noextract = eve-transl5.11-en.tar.gz - noextract = eve-transl5.11-fr.tar.gz - noextract = eve-transl5.11-ja.tar.gz - noextract = eve-transl5.11-ru.tar.gz - noextract = eve-transl5.11-zh.tar.gz + noextract = eve-transl5.12-de.tar.gz + noextract = eve-transl5.12-en.tar.gz + noextract = eve-transl5.12-fr.tar.gz + noextract = eve-transl5.12-ko.tar.gz + noextract = eve-transl5.12-ru.tar.gz + noextract = eve-transl5.12-zh.tar.gz noextract = https://github.com/megastep/makeself/releases/download/release-2.4.0/makeself-2.4.0.run source = evelauncher.desktop source = evelauncher.sh + source = evelauncher.sh.in source = evelauncher.sh.real source = evesetup.shlib source = everegedit.desktop @@ -38,17 +50,18 @@ pkgbase = evesetup source = setup.sh.in source = eve-icons.tar.gz source = eve-icons_large.tar.gz - source = eve-transl5.11-de.tar.gz - source = eve-transl5.11-en.tar.gz - source = eve-transl5.11-fr.tar.gz - source = eve-transl5.11-ja.tar.gz - source = eve-transl5.11-ru.tar.gz - source = eve-transl5.11-zh.tar.gz + source = eve-transl5.12-de.tar.gz + source = eve-transl5.12-en.tar.gz + source = eve-transl5.12-fr.tar.gz + source = eve-transl5.12-ko.tar.gz + source = eve-transl5.12-ru.tar.gz + source = eve-transl5.12-zh.tar.gz source = https://github.com/megastep/makeself/releases/download/release-2.4.0/makeself-2.4.0.run source = https://github.com/doitsujin/dxvk/releases/download/v1.7/dxvk-1.7.tar.gz - source = https://binaries.eveonline.com/evelauncher-1548102.tar.gz + source = https://binaries.eveonline.com/evelauncher-1747682.tar.gz sha256sums = ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4 - sha256sums = 9758ff906a3e849e94f6edeb0e0fdf59627f713bc1a9b6e06f171a3285d0a007 + sha256sums = 29b6f2cda542c8f3f3845fb3e1ff3e9ac2a645d389c1618bdac5fa69947a2b4b + sha256sums = 7c658874857586e70d5b727895905c884cf6aa7b1d172f3811ab62bec52d98c4 sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21 sha256sums = dc3b9db6821e6889e4afeecb57758c73b5e1802437e9d99db98ac43ff77171e6 sha256sums = a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b @@ -61,19 +74,19 @@ pkgbase = evesetup sha256sums = 261da84107168979d241c60cd7adbfee0f6675464675faaefd5f6140009d54d8 sha256sums = 528fc6627e8893db5d7092194e9f3320067f2f1f4593a206aee8a5207956e563 sha256sums = d4610df883778f91e0ea5feba84720dfe814af0b9960677e3861809d70de24b2 - sha256sums = e6a00ad0a14f66533dbbc2485388433440dd656e54a15ceeffe5a75d8d736158 - sha256sums = c7108348a1d19e146bb19bf47da342d04ab4dcaf730ce59b2082535764eeb4f2 + sha256sums = 342c32f51a196fd21db9f7930c122ea38e25bd5e8be5574fd404b218c70d2fb4 + sha256sums = cf97637f85a60c6d3f3ff70ecd2ed0ad1427d5f56253bd86839ed3b2ac40c509 sha256sums = 69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3 sha256sums = 762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422 - sha256sums = 47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a - sha256sums = 1c3df28324c8498e34d2e789fd1f36577afa5a31bdbb278d752f7ef8c6ec5516 - sha256sums = bb63c2ea31d204f4d8eb270848674ad898ed45bbf0a9cea480611581f1149e4f - sha256sums = f78996a8b01463891e97270b8f9d9fa5a61ccf0710e1163aff0c0c49ce3849c3 - sha256sums = 7ae1c6324c4ad43ab3f18f5a3ceaa48b34ede5466b7a0b9351d018e8cef9bbd0 - sha256sums = 1936061a14432ab2632ea3ff15d45350b59ac822985445f597a4a5db44a35ae6 + sha256sums = 980d68abd6f4a662b69efd19145112e88f349044fa1ed5cb6d0a840a92cb42e4 + sha256sums = 777ad02015e07a6f7698b2c373997f5152954592acee85e3b189a4a7270326b1 + sha256sums = ab005b213aec42b21d2e5ef2dcbff4b0a97ee7f7a1df5dc6401afa95271000d1 + sha256sums = 03950f576befa34d95fe2839a752f15584a4001c3b02416bf22e9991f03b856b + sha256sums = 1a83a791b5a189823f71cdfb1e0c0e15139ff7f563bfb3eac70a5fa4ad9ebc22 + sha256sums = 5ffd6578dfbb9bf1647fbae819e3ddae0722c2613779c122d86963123470359f sha256sums = ca66a6113ce98152b85c8d847949f8c90ab9ba798e106bfc225d4ed3c2e2e3e2 sha256sums = 67d78239906c24bd50a5ecbc2fd792c1721e274a7a60dd22f74b21b08ca4c7a1 - sha256sums = 6d49defd626b0643dce83fcd258f3bf3ece8f8e6cefbea37b3b61c8ae0752d85 + sha256sums = 98ccf4b9932d7fb74896461f764c61921592a73089e3fcb4063fe7836c6a0bca pkgname = evesetup @@ -1,13 +1,27 @@ #Maintainer: Gharim Turen <gharim@turen.de> pkgname=evesetup -pkgver=1548102 -pkgrel=14 +pkgver=1747682 +pkgrel=1 pkgdesc="An inofficial EVE Online Launcher Setup Tool." arch=(x86_64) url="https://forums.eveonline.com/t/eve-installing/71494" license=('custom') -depends=('p7zip' 'vulkan-icd-loader' 'wine') +install=${pkgname}.install + +depends=('icu' + 'openssl' + 'openssl-1.0' + 'p7zip' + 'qt5-base' + 'qt5-declarative' + 'qt5-translations' + 'qt5-location' + 'qt5-webchannel' + 'qt5-webengine' + 'qt5-websockets' + 'vulkan-icd-loader' + 'wine') optdepends=('libnotify' 'winetricks') @@ -15,6 +29,7 @@ conflicts=('evelauncher' 'evesetup_dev' 'evesetup-beta') source=("evelauncher.desktop" "evelauncher.sh" + "evelauncher.sh.in" "evelauncher.sh.real" "evesetup.shlib" "everegedit.desktop" @@ -31,22 +46,22 @@ source=("evelauncher.desktop" "setup.sh.in" "eve-icons.tar.gz" "eve-icons_large.tar.gz" - "eve-transl5.11-de.tar.gz" - "eve-transl5.11-en.tar.gz" - "eve-transl5.11-fr.tar.gz" - "eve-transl5.11-ja.tar.gz" - "eve-transl5.11-ru.tar.gz" - "eve-transl5.11-zh.tar.gz" + "eve-transl5.12-de.tar.gz" + "eve-transl5.12-en.tar.gz" + "eve-transl5.12-fr.tar.gz" + "eve-transl5.12-ko.tar.gz" + "eve-transl5.12-ru.tar.gz" + "eve-transl5.12-zh.tar.gz" "https://github.com/megastep/makeself/releases/download/release-2.4.0/makeself-2.4.0.run" "https://github.com/doitsujin/dxvk/releases/download/v1.7/dxvk-1.7.tar.gz" "https://binaries.eveonline.com/evelauncher-${pkgver}.tar.gz") -noextract=('eve-transl5.11-de.tar.gz' - 'eve-transl5.11-en.tar.gz' - 'eve-transl5.11-fr.tar.gz' - 'eve-transl5.11-ja.tar.gz' - 'eve-transl5.11-ru.tar.gz' - 'eve-transl5.11-zh.tar.gz' +noextract=('eve-transl5.12-de.tar.gz' + 'eve-transl5.12-en.tar.gz' + 'eve-transl5.12-fr.tar.gz' + 'eve-transl5.12-ko.tar.gz' + 'eve-transl5.12-ru.tar.gz' + 'eve-transl5.12-zh.tar.gz' 'https://github.com/megastep/makeself/releases/download/release-2.4.0/makeself-2.4.0.run') package() { @@ -58,8 +73,8 @@ package() { install -d "${pkgdir}/usr/share/applications" install -d "${pkgdir}/usr/share/icons" sed -i s,ELVER=\"\",ELVER=\"${pkgver}\", "${srcdir}/evelauncher.sh" + sed -i 2\ s,[0-9].*\",${pkgver}\", "${srcdir}/evelauncher.lua" sed -i s,SETUPDIR=\"\",SETUPDIR=\"/opt/${pkgname}\", "${srcdir}/evelauncher.sh" - sed -i s,./eve-transl,/opt/${pkgname}/lib/eve-transl, "${srcdir}/evelauncher.sh" for cmd in backup launcher.sh regedit restore wine winecfg winetricks ;do cmd=eve$cmd if [ -f "${srcdir}/$cmd" ] ;then @@ -80,27 +95,21 @@ package() { fi done cp ${srcdir}/evesetup.shlib ${pkgdir}/opt/${pkgname}/lib - cp ${srcdir}/eve-transl5.11* ${pkgdir}/opt/${pkgname}/lib cp ${srcdir}/evelauncher.lua ${pkgdir}/opt/${pkgname}/doc cp ${srcdir}/evelauncher.kwinrule ${pkgdir}/opt/${pkgname}/doc cp -r ${srcdir}/dxvk-1.7/x32 ${pkgdir}/opt/${pkgname}/lib/dxvk/ cp -r ${srcdir}/dxvk-1.7/x64 ${pkgdir}/opt/${pkgname}/lib/dxvk/ echo "dxvk-1.7" >${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* + rm -f ${srcdir}/evelauncher/libicu* ${srcdir}/evelauncher/libssl* + rm -f ${srcdir}/evelauncher/libpng* ${srcdir}/evelauncher/libxcb* cp -f ${srcdir}/evelauncher.sh.real ${srcdir}/evelauncher/evelauncher.sh - rm -f ${srcdir}/evelauncher/*.a ${srcdir}/evelauncher/*.la - rm -f ${srcdir}/evelauncher/*.prl ${srcdir}/evelauncher/libxcb* chmod 0755 ${srcdir}/evelauncher/* - chmod 0644 ${srcdir}/evelauncher/*.qm - chmod 0644 ${srcdir}/evelauncher/qt.conf + chmod 0644 ${srcdir}/evelauncher/*.qm ${srcdir}/evelauncher/roots.pem chmod 0644 ${srcdir}/evelauncher/errorpage/* ln -sf evelauncher.sh ${srcdir}/evelauncher/LogLite.sh - ln -sf libicudata.so.55.1 ${srcdir}/evelauncher/libicudata.so - ln -sf libicudata.so.55.1 ${srcdir}/evelauncher/libicudata.so.55 - ln -sf libicui18n.so.55.1 ${srcdir}/evelauncher/libicui18n.so - ln -sf libicui18n.so.55.1 ${srcdir}/evelauncher/libicui18n.so.55 - ln -sf libicuuc.so.55.1 ${srcdir}/evelauncher/libicuuc.so - ln -sf libicuuc.so.55.1 ${srcdir}/evelauncher/libicuuc.so.55 ln -sf libgpr.so.6.0.0 ${srcdir}/evelauncher/libgpr.so ln -sf libgpr.so.6.0.0 ${srcdir}/evelauncher/libgpr.so.6 ln -sf libgrpc++.so.1.12.0 ${srcdir}/evelauncher/libgrpc++.so @@ -108,7 +117,6 @@ package() { ln -sf libgrpc++.so.1.12.0 ${srcdir}/evelauncher/libgrpc++.so.6 ln -sf libgrpc.so.6.0.0 ${srcdir}/evelauncher/libgrpc.so ln -sf libgrpc.so.6.0.0 ${srcdir}/evelauncher/libgrpc.so.6 - ln -sf libpng12.so.0.54.0 ${srcdir}/evelauncher/libpng12.so.0 ln -sf libprotobuf.so.16.0.0 ${srcdir}/evelauncher/libprotobuf.so ln -sf libprotobuf.so.16.0.0 ${srcdir}/evelauncher/libprotobuf.so.16 find ${srcdir}/evelauncher/ -type f -exec strip -s {} 2>/dev/null \; @@ -116,7 +124,8 @@ package() { } sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4' - '9758ff906a3e849e94f6edeb0e0fdf59627f713bc1a9b6e06f171a3285d0a007' + '29b6f2cda542c8f3f3845fb3e1ff3e9ac2a645d389c1618bdac5fa69947a2b4b' + '7c658874857586e70d5b727895905c884cf6aa7b1d172f3811ab62bec52d98c4' '80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21' 'dc3b9db6821e6889e4afeecb57758c73b5e1802437e9d99db98ac43ff77171e6' 'a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b' @@ -129,16 +138,16 @@ sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4' '261da84107168979d241c60cd7adbfee0f6675464675faaefd5f6140009d54d8' '528fc6627e8893db5d7092194e9f3320067f2f1f4593a206aee8a5207956e563' 'd4610df883778f91e0ea5feba84720dfe814af0b9960677e3861809d70de24b2' - 'e6a00ad0a14f66533dbbc2485388433440dd656e54a15ceeffe5a75d8d736158' - 'c7108348a1d19e146bb19bf47da342d04ab4dcaf730ce59b2082535764eeb4f2' + '342c32f51a196fd21db9f7930c122ea38e25bd5e8be5574fd404b218c70d2fb4' + 'cf97637f85a60c6d3f3ff70ecd2ed0ad1427d5f56253bd86839ed3b2ac40c509' '69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3' '762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422' - '47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a' - '1c3df28324c8498e34d2e789fd1f36577afa5a31bdbb278d752f7ef8c6ec5516' - 'bb63c2ea31d204f4d8eb270848674ad898ed45bbf0a9cea480611581f1149e4f' - 'f78996a8b01463891e97270b8f9d9fa5a61ccf0710e1163aff0c0c49ce3849c3' - '7ae1c6324c4ad43ab3f18f5a3ceaa48b34ede5466b7a0b9351d018e8cef9bbd0' - '1936061a14432ab2632ea3ff15d45350b59ac822985445f597a4a5db44a35ae6' + '980d68abd6f4a662b69efd19145112e88f349044fa1ed5cb6d0a840a92cb42e4' + '777ad02015e07a6f7698b2c373997f5152954592acee85e3b189a4a7270326b1' + 'ab005b213aec42b21d2e5ef2dcbff4b0a97ee7f7a1df5dc6401afa95271000d1' + '03950f576befa34d95fe2839a752f15584a4001c3b02416bf22e9991f03b856b' + '1a83a791b5a189823f71cdfb1e0c0e15139ff7f563bfb3eac70a5fa4ad9ebc22' + '5ffd6578dfbb9bf1647fbae819e3ddae0722c2613779c122d86963123470359f' 'ca66a6113ce98152b85c8d847949f8c90ab9ba798e106bfc225d4ed3c2e2e3e2' '67d78239906c24bd50a5ecbc2fd792c1721e274a7a60dd22f74b21b08ca4c7a1' - '6d49defd626b0643dce83fcd258f3bf3ece8f8e6cefbea37b3b61c8ae0752d85') + '98ccf4b9932d7fb74896461f764c61921592a73089e3fcb4063fe7836c6a0bca') diff --git a/build_installer.sh b/build_installer.sh index b3429c38040d..bde51d3ce0dc 100755 --- a/build_installer.sh +++ b/build_installer.sh @@ -68,7 +68,7 @@ echo "done." printf "\nCopy needed files from AUR source..." for eia in ../eve-icons*.tar.gz ;do tar xf $eia -C evesetup/ ;done -for eta in ../eve-transl5.11-??.tar.gz ;do cp $eta evesetup/ ;done +for eta in ../eve-transl5.12-??.tar.gz ;do cp $eta evesetup/ ;done for cmd in backup launcher.sh regedit restore wine winecfg winetricks ;do cmd=eve$cmd if [ -f ../$cmd ] ;then cp ../$cmd evesetup/ ;fi @@ -77,7 +77,7 @@ done cp ../evesetup.shlib evesetup/ cp ../evelauncher.kwinrule evesetup/ cp ../evelauncher.lua evesetup/ -cp ../evelauncher.sh evesetup/ +cp ../evelauncher.sh.in evesetup/evelauncher.sh sed -i s,ELVER=\"\",ELVER=\"$version\", evesetup/evelauncher.sh cp ../setup.sh.in evesetup/setup.sh sed -i s,elver=\"\",elver=\"$version\", evesetup/setup.sh diff --git a/eve-transl5.11-de.tar.gz b/eve-transl5.11-de.tar.gz Binary files differdeleted file mode 100644 index 6f4bce12ba23..000000000000 --- a/eve-transl5.11-de.tar.gz +++ /dev/null diff --git a/eve-transl5.11-en.tar.gz b/eve-transl5.11-en.tar.gz Binary files differdeleted file mode 100644 index cde9afd2cccd..000000000000 --- a/eve-transl5.11-en.tar.gz +++ /dev/null diff --git a/eve-transl5.11-fr.tar.gz b/eve-transl5.11-fr.tar.gz Binary files differdeleted file mode 100644 index dcded1bc6d18..000000000000 --- a/eve-transl5.11-fr.tar.gz +++ /dev/null diff --git a/eve-transl5.11-ja.tar.gz b/eve-transl5.11-ja.tar.gz Binary files differdeleted file mode 100644 index 82f1f190c75a..000000000000 --- a/eve-transl5.11-ja.tar.gz +++ /dev/null diff --git a/eve-transl5.11-ru.tar.gz b/eve-transl5.11-ru.tar.gz Binary files differdeleted file mode 100644 index a7a9b6879c3e..000000000000 --- a/eve-transl5.11-ru.tar.gz +++ /dev/null diff --git a/eve-transl5.11-zh.tar.gz b/eve-transl5.11-zh.tar.gz Binary files differdeleted file mode 100644 index 221e18c336f5..000000000000 --- a/eve-transl5.11-zh.tar.gz +++ /dev/null diff --git a/eve-transl5.12-de.tar.gz b/eve-transl5.12-de.tar.gz Binary files differnew file mode 100644 index 000000000000..88023051730c --- /dev/null +++ b/eve-transl5.12-de.tar.gz diff --git a/eve-transl5.12-en.tar.gz b/eve-transl5.12-en.tar.gz Binary files differnew file mode 100644 index 000000000000..e5e0e2851bc5 --- /dev/null +++ b/eve-transl5.12-en.tar.gz diff --git a/eve-transl5.12-fr.tar.gz b/eve-transl5.12-fr.tar.gz Binary files differnew file mode 100644 index 000000000000..83b519862d20 --- /dev/null +++ b/eve-transl5.12-fr.tar.gz diff --git a/eve-transl5.12-ko.tar.gz b/eve-transl5.12-ko.tar.gz Binary files differnew file mode 100644 index 000000000000..fd481ad9d83c --- /dev/null +++ b/eve-transl5.12-ko.tar.gz diff --git a/eve-transl5.12-ru.tar.gz b/eve-transl5.12-ru.tar.gz Binary files differnew file mode 100644 index 000000000000..126a24ea9584 --- /dev/null +++ b/eve-transl5.12-ru.tar.gz diff --git a/eve-transl5.12-zh.tar.gz b/eve-transl5.12-zh.tar.gz Binary files differnew file mode 100644 index 000000000000..c9a92009b841 --- /dev/null +++ b/eve-transl5.12-zh.tar.gz diff --git a/evelauncher.sh b/evelauncher.sh index bac55f47f0aa..d9407b2816f7 100644 --- a/evelauncher.sh +++ b/evelauncher.sh @@ -3,7 +3,6 @@ set -e ELVER="" -QTVER="5.11" EVEDIR="$HOME/.local/lib/EVE" SETUPDIR="" LAUNCHER="$EVEDIR/Launcher" @@ -16,14 +15,6 @@ check_elv check_wine check_steam -if [ ! -r "$LAUNCHER/translations/qt_en.qm" ] ;then - if [ -r "$LAUNCHER/libQt5Core.so.$QTVER.0" ] ;then - for eta in ./eve-transl${QTVER}-??.tar.gz ;do - tar xf $eta -C $LAUNCHER - done - fi -fi - export DXVK_LOG_LEVEL=${DXVK_LOG_LEVEL:-error} cd $EVEDIR diff --git a/evelauncher.sh.in b/evelauncher.sh.in new file mode 100644 index 000000000000..f3325e085eef --- /dev/null +++ b/evelauncher.sh.in @@ -0,0 +1,30 @@ +#!/bin/sh + +set -e + +ELVER="" +QTVER="5.12" +EVEDIR="$HOME/.local/lib/EVE" +SETUPDIR="" +LAUNCHER="$EVEDIR/Launcher" +WINEPATH="/usr/bin" + +. ./evesetup.shlib + +check_env +check_elv +check_wine +check_steam + +if [ ! -r "$LAUNCHER/translations/qt_en.qm" ] ;then + if [ -r "$LAUNCHER/libQt5Core.so.$QTVER.0" ] ;then + for eta in ./eve-transl${QTVER}-??.tar.gz ;do + tar xf $eta -C $LAUNCHER + done + fi +fi + +export DXVK_LOG_LEVEL=${DXVK_LOG_LEVEL:-error} + +cd $EVEDIR +exec $LAUNCHER/evelauncher.sh diff --git a/evesetup.install b/evesetup.install new file mode 100644 index 000000000000..8a6567ebd769 --- /dev/null +++ b/evesetup.install @@ -0,0 +1,21 @@ +post_install() { + if [ ! -d /usr/local/share/grpc ] ;then + printf "\nAdding workaround for missing roots.pem in /usr/local/share/grpc.\n\n" + mkdir -p /usr/local/share/grpc + touch /usr/local/share/grpc/needed_by_evelauncher + tar -xf /opt/evesetup/lib/evelauncher-1747682.tar.gz \ + -C /opt/evesetup/lib --strip-components=1 \ + evelauncher/roots.pem + ln -s /opt/evesetup/lib/roots.pem /usr/local/share/grpc/roots.pem + fi +} + +pre_remove() { + if [ -d /usr/local/share/grpc ] ;then + if [ -r /usr/local/share/grpc/needed_by_evelauncher ] ;then + printf "\nRemove workaround for missing roots.pem in /usr/local/share/grpc.\n\n" + rm /opt/evesetup/lib/roots.pem + rm -rf /usr/local/share/grpc + fi + fi +} diff --git a/setup.sh.in b/setup.sh.in index f7b66895f2f8..66580de2ac70 100644 --- a/setup.sh.in +++ b/setup.sh.in @@ -88,7 +88,7 @@ build_lib() { cd evelauncher/ rm -f ./*.a ./*.la ./*.prl ./libxcb* chmod 0755 ./* - chmod 0644 ./*.qm ./*.conf ./errorpage/* + chmod 0644 ./*.qm ./*.pem ./*.conf ./errorpage/* echo "done." printf "\nReplace identical files with symbolic links..." ln -sf evelauncher.sh LogLite.sh @@ -164,7 +164,7 @@ destdir="/opt/evesetup" bindir="$destdir/bin" libdir="$destdir/lib" docdir="$destdir/doc" -qtver="5.11" +qtver="5.12" elver="" elcsum="" dvver="" |