update to 3.6.0

3 files changed, 33 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 885d5eefcf04..329c88123804 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,23 @@
 pkgbase = translationcore-bin
 	pkgdesc = An open source platform for checking and managing Bible translation projects
-	pkgver = 3.5.1
-	pkgrel = 2
+	pkgver = 3.6.0
+	pkgrel = 1
 	url = https://www.translationcore.com/
 	arch = aarch64
 	arch = x86_64
 	license = ISC
-	makedepends = asar
 	depends = bash
 	depends = electron25
 	depends = hicolor-icon-theme
-	provides = translationcore=3.5.1
+	provides = translationcore=3.6.0
 	conflicts = translationcore
-	source = LICENSE::https://raw.githubusercontent.com/unfoldingWord/translationCore/v3.5.1/LICENSE
+	source = LICENSE::https://raw.githubusercontent.com/unfoldingWord/translationCore/v3.6.0/LICENSE
 	source = translationcore.sh
 	sha256sums = a756bd73c46e3e9b85ff0222658f4c63851ebc5af63811adc4333ff618688417
-	sha256sums = eb05b462f6b48d3b3e51622881942cff873d8a809ce030df46d6eaec2c40c724
-	source_aarch64 = translationcore-3.5.1-aarch64.deb::https://github.com/unfoldingWord/translationCore/releases/download/v3.5.1/tC-linux-arm64-3.5.1-MAX-6e1cd7b.deb
-	sha256sums_aarch64 = 6df8af5f0a5a8249a52944f41685765ac576521d561e910cb81162b4bca144ae
-	source_x86_64 = translationcore-3.5.1-x86_64.deb::https://github.com/unfoldingWord/translationCore/releases/download/v3.5.1/tC-linux-x64-3.5.1-MAX-6e1cd7b.deb
-	sha256sums_x86_64 = 6a5423c5b368a0538e9809d3ad625b12d245ed88766c17a3126751a36585ebd4
+	sha256sums = b5b7830edb74de9b8d10f7216947fd9ed62ac39d9287db3e71757a63fbda64ef
+	source_aarch64 = translationcore-3.6.0-aarch64.deb::https://github.com/unfoldingWord/translationCore/releases/download/v3.6.0/tC-linux-arm64-3.6.0-MAX-2bc4476.deb
+	sha256sums_aarch64 = 7b002e0352dead0c979de9d656f8719476e35f7919874fd59f079a47657ab467
+	source_x86_64 = translationcore-3.6.0-x86_64.deb::https://github.com/unfoldingWord/translationCore/releases/download/v3.6.0/tC-linux-x64-3.6.0-MAX-2bc4476.deb
+	sha256sums_x86_64 = 9d69deeac3caec8793813a1de764b148fd18002f246e42705d369a28a9ad6c7c
 
 pkgname = translationcore-bin
diff --git a/PKGBUILD b/PKGBUILD
index 8c00acc88b98..110a76d3c3a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=translationcore-bin
 _pkgname=translationCore
-pkgver=3.5.1
-pkgrel=2
+pkgver=3.6.0
+pkgrel=1
 pkgdesc="An open source platform for checking and managing Bible translation projects"
 arch=('aarch64' 'x86_64')
 url="https://www.translationcore.com/"
@@ -10,25 +10,31 @@ _githuburl="https://github.com/unfoldingWord/translationCore"
 license=('ISC')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
-depends=('bash' 'electron25' 'hicolor-icon-theme')
-makedepends=('asar')
-source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.deb::${_githuburl}/releases/download/v${pkgver}/tC-linux-arm64-${pkgver}-MAX-6e1cd7b.deb")
-source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.deb::${_githuburl}/releases/download/v${pkgver}/tC-linux-x64-${pkgver}-MAX-6e1cd7b.deb")
-source=("LICENSE::https://raw.githubusercontent.com/unfoldingWord/translationCore/v${pkgver}/LICENSE"
-        "${pkgname%-bin}.sh")
+depends=(
+    'bash'
+    'electron25'
+    'hicolor-icon-theme'
+)
+source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.deb::${_githuburl}/releases/download/v${pkgver}/tC-linux-arm64-${pkgver}-MAX-2bc4476.deb")
+source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.deb::${_githuburl}/releases/download/v${pkgver}/tC-linux-x64-${pkgver}-MAX-2bc4476.deb")
+source=(
+    "LICENSE::https://raw.githubusercontent.com/unfoldingWord/translationCore/v${pkgver}/LICENSE"
+    "${pkgname%-bin}.sh"
+)
 sha256sums=('a756bd73c46e3e9b85ff0222658f4c63851ebc5af63811adc4333ff618688417'
-            'eb05b462f6b48d3b3e51622881942cff873d8a809ce030df46d6eaec2c40c724')
-sha256sums_aarch64=('6df8af5f0a5a8249a52944f41685765ac576521d561e910cb81162b4bca144ae')
-sha256sums_x86_64=('6a5423c5b368a0538e9809d3ad625b12d245ed88766c17a3126751a36585ebd4')
-prepare() {
+            'b5b7830edb74de9b8d10f7216947fd9ed62ac39d9287db3e71757a63fbda64ef')
+sha256sums_aarch64=('7b002e0352dead0c979de9d656f8719476e35f7919874fd59f079a47657ab467')
+sha256sums_x86_64=('9d69deeac3caec8793813a1de764b148fd18002f246e42705d369a28a9ad6c7c')
+build() {
     bsdtar -xf "${srcdir}/data.tar.xz"
     asar pack "${srcdir}/opt/${pkgname%-bin}/resources/app" "${srcdir}/${pkgname%-bin}.asar"
     sed "s|/opt/${pkgname%-bin}/${_pkgname}|${pkgname%-bin}|g;s|unfoldingword-${pkgname%-bin}|${pkgname%-bin}|g" \
         -i "${srcdir}/opt/${pkgname%-bin}/unfoldingword-${pkgname%-bin}.desktop"
 }
 package() {
-    install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/${pkgname%-bin}.asar" -t "${pkgdir}/opt/${pkgname%-bin}"
+    install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
+    install -Dm755 -d "${pkgdir}/usr/lib/${pkgname%-bin}"
+    cp -r "${srcdir}/opt/${pkgname%-bin}/resources/app" "${pkgdir}/usr/lib/${pkgname%-bin}"
     install -Dm644 "${srcdir}/opt/${pkgname%-bin}/unfoldingword-${pkgname%-bin}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop"
     for _icons in 16 22 32 48 64 128;do
         install -Dm644 "${srcdir}/opt/${pkgname%-bin}/${pkgname%-bin}-${_icons}.png" "${pkgdir}/usr/share/icons/hicolor/${_icons}x${_icons}/apps/${pkgname%-bin}.png"
diff --git a/translationcore.sh b/translationcore.sh
index 83ffc67f185c..a0bf12649e29 100644
--- a/translationcore.sh
+++ b/translationcore.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron25
-_ASAR="/opt/translationcore/translationcore.asar"
+APPDIR="/usr/lib/translationcore"
+export PATH="${APPDIR}:${PATH}"
+#export LD_LIBRARY_PATH="${APPDIR}/lib:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else