Merge pull request #4 from txtsd/ci

txtsd · Oct 20, 2023 · 0c27185 · 0c27185
2 parents c82831a + a2728b7
commit 0c27185
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/blockbench-git/.SRCINFO b/blockbench-git/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = blockbench-git
 	pkgdesc = A low-poly 3D model editor (git version)
 	pkgver = v4.6.4.r0.gf5e43877
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/JannisX11/blockbench
 	arch = x86_64
 	arch = aarch64

diff --git a/blockbench-git/PKGBUILD b/blockbench-git/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=blockbench-git
 pkgver=v4.6.4.r0.gf5e43877
-pkgrel=1
+pkgrel=2
 pkgdesc="A low-poly 3D model editor (git version)"
 arch=('x86_64' 'aarch64')
 url=https://github.com/JannisX11/blockbench
@@ -13,8 +13,6 @@ conflicts=(blockbench)
 
 _pkgname=blockbench
 _electron=electron
-_electronDist=/usr/lib/${_electron}
-_electronVersion=$(cat ${_electronDist}/version)
 
 depends=("${_electron}" 'giblib')
 makedepends=(git npm)
@@ -30,6 +28,11 @@ pkgver() {
 
 prepare() {
   cd "${srcdir}/${_pkgname}"
+
+  _electronDist=/usr/lib/${_electron}
+  _electronVersion=$(cat ${_electronDist}/version)
+  _electronVersionMajor=${_electronVersion%%.*}
+
   npm install
 }
 
@@ -40,11 +43,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"
 }