summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authortxtsd2023-06-27 13:31:22 +0530
committertxtsd2023-06-27 13:31:22 +0530
commitba27ad5ec5139f13cf5d98820a8a6e0c86dc19a1 (patch)
tree4fd9da975be170289e1fa1a809dc5c546624c521
parent4978413b29ce11f84e2deb25dc464ebbca41c9a2 (diff)
downloadaur-ba27ad5ec5139f13cf5d98820a8a6e0c86dc19a1.tar.gz
upgpkg: blockbench 4.7.4-2
Ref: https://gitlab.archlinux.org/archlinux/packaging/packages/electron/-/commit/6355d36f0e1f11599c3607d4a1bafacd6523e532 This commit turned /usr/lib/electron into a symlink, so we now install directly to the symlinked directory Signed-off-by: txtsd <code@ihavea.quest>
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD11
2 files changed, 7 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 649f8eb9bb32..c26793cc0a06 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = blockbench
pkgdesc = A low-poly 3D model editor
pkgver = 4.7.4
- pkgrel = 1
+ pkgrel = 2
url = https://blockbench.net/
arch = x86_64
license = GPL3
diff --git a/PKGBUILD b/PKGBUILD
index 9e54c80e83b4..a597183c258b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=blockbench
_pkgname=Blockbench
pkgver=4.7.4
-pkgrel=1
+pkgrel=2
pkgdesc="A low-poly 3D model editor"
arch=('x86_64')
url="https://blockbench.net/"
@@ -16,6 +16,7 @@ _pkgname=blockbench
_electron=electron
_electronDist=/usr/lib/${_electron}
_electronVersion=$(cat ${_electronDist}/version)
+_electronVersionMajor=${_electronVersion%%.*}
depends=("${_electron}" 'giblib')
makedepends=(git npm)
@@ -36,11 +37,11 @@ build() {
package() {
install -d "${pkgdir}/usr/"{bin,share/{pixmaps,applications}}
- install -d "${pkgdir}/${_electronDist}/resources"
- echo -e "#!/bin/bash\nexec ${_electron} ${_electronDist}/resources/${_pkgname}.asar \"\$@\"" > "${pkgdir}/usr/bin/${_pkgname}"
+ install -d "${pkgdir}/${_electronDist}${_electronVersionMajor}/resources"
+ echo -e "#!/bin/bash\nexec ${_electron} ${_electronDist}${_electronVersionMajor}/resources/${_pkgname}.asar \"\$@\"" > "${pkgdir}/usr/bin/${_pkgname}"
chmod 755 "${pkgdir}/usr/bin/${_pkgname}"
install "${srcdir}/${_pkgname}/icon.png" "${pkgdir}/usr/share/pixmaps/${_pkgname}.png"
install "${srcdir}/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
- install "${srcdir}/${_pkgname}/dist/linux-unpacked/resources/app.asar" "${pkgdir}/${_electronDist}/resources/${_pkgname}.asar"
- cp -r "${srcdir}/${_pkgname}/dist/linux-unpacked/resources/app.asar.unpacked" "${pkgdir}/${_electronDist}/resources/${_pkgname}.asar.unpacked"
+ install "${srcdir}/${_pkgname}/dist/linux-unpacked/resources/app.asar" "${pkgdir}${_electronDist}${_electronVersionMajor}/resources/${_pkgname}.asar"
+ cp -r "${srcdir}/${_pkgname}/dist/linux-unpacked/resources/app.asar.unpacked" "${pkgdir}${_electronDist}${_electronVersionMajor}/resources/${_pkgname}.asar.unpacked"
}