diff --git a/.SRCINFO b/.SRCINFO index 809efecd057c..74e83496420a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,17 +1,16 @@ pkgbase = hugin-messenger-bin pkgdesc = The new version of the private messaging desktop application powered by the Kryptokrona Blockchain. pkgver = 0.4.0 - pkgrel = 2 + pkgrel = 3 url = https://hugin.chat/ arch = x86_64 license = GPL-3.0-only - makedepends = asar depends = electron19 provides = hugin-messenger=0.4.0 conflicts = hugin-messenger source = hugin-messenger-0.4.0.deb::https://github.com/kryptokrona/hugin-desktop/releases/download/v0.4.0/hugin-messenger_0.4.0_amd64.deb source = hugin-messenger.sh sha256sums = a2a850d7ef29021066d82cee855cbb8f959dcff5e4b0bcf50423c36d45139e12 - sha256sums = 1d3f21d54a2d9d1a53661bd91c2afd00df79b0ce4057a66b4c953febfc464cd8 + sha256sums = 50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe pkgname = hugin-messenger-bin diff --git a/PKGBUILD b/PKGBUILD index 0cce43c5bda8..10457e6e6c4c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=hugin-messenger-bin _pkgname="Hugin Messenger" pkgver=0.4.0 _electronversion=19 -pkgrel=2 +pkgrel=3 pkgdesc="The new version of the private messaging desktop application powered by the Kryptokrona Blockchain." arch=('x86_64') url="https://hugin.chat/" @@ -14,31 +14,24 @@ provides=("${pkgname%-bin}=${pkgver}") depends=( "electron${_electronversion}" ) -makedepends=( - 'asar' -) source=( "${pkgname%-bin}-${pkgver}.deb::${_ghurl}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb" "${pkgname%-bin}.sh" ) sha256sums=('a2a850d7ef29021066d82cee855cbb8f959dcff5e4b0bcf50423c36d45139e12' - '1d3f21d54a2d9d1a53661bd91c2afd00df79b0ce4057a66b4c953febfc464cd8') + '50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe') build() { sed -e "s|@electronversion@|${_electronversion}|g" \ -e "s|@appname@|${pkgname%-bin}|g" \ - -e "s|@appasar@|app.asar|g" \ + -e "s|@runname@|app.asar|g" \ -i "${srcdir}/${pkgname%-bin}.sh" - bsdtar -xf "${srcdir}/data.tar.xz" + bsdtar -xf "${srcdir}/data."* sed "s|\"/opt/${_pkgname}/${pkgname%-bin}\"|${pkgname%-bin}|g;s|Utility|Network|g" \ -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" - asar e "${srcdir}/opt/${_pkgname}/resources/app.asar" "${srcdir}/app.asar.unpacked" - sed "97s|!||g" -i "${srcdir}/app.asar.unpacked/src/backend/electron.cjs" - install -Dm644 "${srcdir}/opt/${_pkgname}/resources/bin/"*.png -t "${srcdir}/app.asar.unpacked/bin" - asar p "${srcdir}/app.asar.unpacked" "${srcdir}/app.asar" } package() { install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}" - install -Dm644 "${srcdir}/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}" + install -Dm644 "${srcdir}/opt/${_pkgname}/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}" install -Dm644 "${srcdir}/opt/${_pkgname}/resources/bin/"*.png -t "${pkgdir}/usr/lib/${pkgname%-bin}/bin" install -Dm644 "${srcdir}/usr/share/icons/hicolor/0x0/apps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps" install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications" diff --git a/hugin-messenger.sh b/hugin-messenger.sh index 0d20cddc70ca..86cb3dc6a9bf 100644 --- a/hugin-messenger.sh +++ b/hugin-messenger.sh @@ -1,14 +1,15 @@ -#!/bin/sh +#!/bin/bash set -e _APPDIR="/usr/lib/@appname@" -_ASAR="${_APPDIR}/@appasar@" +_RUNNAME="${_APPDIR}/@runname@" export PATH="${_APPDIR}:${PATH}" export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}" export ELECTRON_IS_DEV=0 +export ELECTRON_FORCE_IS_PACKAGED=true export NODE_ENV=production cd "${_APPDIR}" if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then - exec electron@electronversion@ "${_ASAR}" "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $? else - exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $? fi \ No newline at end of file