1.1-3: add --nox11 extract option, ensure no autoextract, refactor PKGBUILD

3 files changed, 40 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c574c0be14fa..06f1f48c17c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = unigine-superposition
 	pkgdesc = Interactive Unigine Benchmark: walk through a lab of a lone professor
 	pkgver = 1.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://benchmark.unigine.com/superposition
 	arch = x86_64
 	license = custom:UNIGINE Engine
@@ -26,8 +26,9 @@ pkgbase = unigine-superposition
 	depends = qt5-base
 	depends = sh
 	depends = zlib
+	noextract = Unigine_Superposition-1.1.run
 	options = !strip
-	source = https://assets.unigine.com/d/Unigine_Superposition-1.1.run
+	source = Unigine_Superposition-1.1.run::https://assets.unigine.com/d/Unigine_Superposition-1.1.run
 	source = Superposition.desktop
 	b2sums = f0447b0ccd860e653c2308637c93ed29ec851ff9923251edbd37a14b021149038f1c252deb0f3c4954fd4508883b1a2994a87b34a5e18902cef6c82c6ccc6b6b
 	b2sums = 1d9987b5a910b86dac2e252c3187a6a07095da81d06dfafbd2c16bcacb72f602c183334fb6b3c03c7b35418f8dc6e4f2d34a44ab22831d66b67d9e5ed45bc93e
diff --git a/.gitignore b/.gitignore
index 1a5d22791f63..26bedc7d5caa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-pkg/*
-src/*
+pkg/
+src/
 *.tar.gz
 *.tar.gz.asc
 *.pkg.tar
diff --git a/PKGBUILD b/PKGBUILD
index f8ff10023efd..0f9027c206ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=unigine-superposition
 _pkgname=Unigine_Superposition
 pkgver=1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Interactive Unigine Benchmark: walk through a lab of a lone professor"
 arch=('x86_64')
 url="https://benchmark.unigine.com/superposition"
@@ -33,46 +33,58 @@ depends=(
     'zlib'
 )
 makedepends=('patchelf')
-options=("!strip")
-source=("https://assets.unigine.com/d/${_pkgname}-${pkgver}.run" "Superposition.desktop")
+options=('!strip')
+_tarname="${_pkgname}-${pkgver}.run"
+source=("${_tarname}::https://assets.unigine.com/d/${_tarname}" "Superposition.desktop")
+noextract=("${_tarname}")
 b2sums=('f0447b0ccd860e653c2308637c93ed29ec851ff9923251edbd37a14b021149038f1c252deb0f3c4954fd4508883b1a2994a87b34a5e18902cef6c82c6ccc6b6b'
         '1d9987b5a910b86dac2e252c3187a6a07095da81d06dfafbd2c16bcacb72f602c183334fb6b3c03c7b35418f8dc6e4f2d34a44ab22831d66b67d9e5ed45bc93e')
 PKGEXT=.pkg.tar
 
+prepare() {
+    sh "${_tarname}" --noexec --nox11 --target "${pkgname}"
+}
+
 build() {
-    sh ${_pkgname}-${pkgver}.run --target ${pkgname} --noexec
+    mkdir bin
+    cat >> "${srcdir}/bin/unigine-superposition" << \here
+#!/bin/sh
+cd /opt/unigine-superposition/bin
+LD_LIBRARY_PATH='/opt/unigine-superposition/bin:/opt/unigine-superposition/bin/qt/lib' ./launcher
+here
 }
 
 package() {
     cd "${srcdir}/${pkgname}"
+
     # bulk data
-    install -d "${pkgdir}/opt/${pkgname}"
-    cp -R *    "${pkgdir}/opt/${pkgname}"/
+    install -v -dm755 "${pkgdir}/opt/${pkgname}"
+    cp -Rv *    "${pkgdir}/opt/${pkgname}"/
+
     # launcher
-    install -d "${pkgdir}/usr/bin"
-    cat >> "${pkgdir}/usr/bin/unigine-superposition" << \here
-#!/bin/sh
-cd /opt/unigine-superposition/bin
-LD_LIBRARY_PATH='/opt/unigine-superposition/bin:/opt/unigine-superposition/bin/qt/lib' ./launcher
-here
-    chmod a+x "${pkgdir}/usr/bin/unigine-superposition"
+    install -v -Dm755 "${srcdir}/bin/unigine-superposition" -t "${pkgdir}/usr/bin"
+
     # fix openssl1.0 stuff
-    mv -v "${pkgdir}/opt/unigine-superposition/bin/qt/lib/libcrypto.so"{,.1.0.0}
-    find "${pkgdir}/opt/unigine-superposition/bin/qt" -name "*.so*" -exec chmod a+x {} \;
-    ln -sv /opt/unigine-superposition/bin/qt/lib/libcrypto.so.1.0.0 "${pkgdir}/opt/unigine-superposition/bin/qt/lib/libcrypto.so"
+    mv -v "${pkgdir}/opt/${pkgname}/bin/qt/lib/libcrypto.so"{,.1.0.0}
+    find "${pkgdir}/opt/${pkgname}/bin/qt" -name "*.so*" -exec chmod a+x {} \;
+    ln -sv /opt/unigine-superposition/bin/qt/lib/libcrypto.so.1.0.0 "${pkgdir}/opt/${pkgname}/bin/qt/lib/libcrypto.so"
+
     # remove unneeded install scripts
-    rm -v "${pkgdir}/opt/unigine-superposition/"*install.sh
+    rm -v "${pkgdir}/opt/${pkgname}/"*install.sh
+
     # removing unneded libraries
-    rm -v "${pkgdir}/opt/unigine-superposition/bin/libopenal.so"
+    rm -v "${pkgdir}/opt/${pkgname}/bin/libopenal.so"
+
     # removing runpaths
-    patchelf --remove-rpath "${pkgdir}/opt/unigine-superposition/bin/launcher"
+    patchelf --remove-rpath "${pkgdir}/opt/${pkgname}/bin/launcher"
+
     # misc
-    install -Dm644 docs/Superposition_Benchmark_End-User_License_Agreement.pdf "${pkgdir}"/usr/share/licenses/${pkgname}/license
-    install -Dm644 docs/Superposition_Benchmark_User_Manual.pdf "${pkgdir}"/usr/share/doc/${pkgname}/User_Manual.pdf
-    install -Dm644 ../Superposition.desktop "${pkgdir}/usr/share/applications/Superposition.desktop"
+    install -v -Dm644 docs/Superposition_Benchmark_End-User_License_Agreement.pdf "${pkgdir}"/usr/share/licenses/${pkgname}/license
+    install -v -Dm644 docs/Superposition_Benchmark_User_Manual.pdf "${pkgdir}"/usr/share/doc/${pkgname}/User_Manual.pdf
+    install -v -Dm644 ../Superposition.desktop "${pkgdir}/usr/share/applications/Superposition.desktop"
     # icons
     for RES in 16 24 32 48 64 128 256
     do
-        install -Dm644 icons/superposition_icon_${RES}.png "${pkgdir}/usr/share/icons/hicolor/${RES}x${RES}/apps/Superposition.png"
+        install -v -Dm644 icons/superposition_icon_${RES}.png "${pkgdir}/usr/share/icons/hicolor/${RES}x${RES}/apps/Superposition.png"
     done
 }