diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | calmly-writer.sh | 9 |
3 files changed, 12 insertions, 17 deletions
@@ -1,22 +1,20 @@ pkgbase = calmly-writer-bin pkgdesc = An editor designed to focus on what you want to tell, with a simple, unobtrusive and ease-to-use user interface. pkgver = 2.0.54 - pkgrel = 5 + pkgrel = 6 url = https://www.calmlywriter.com arch = aarch64 arch = x86_64 license = LicenseRef-custom - depends = electron24 + depends = electron17 depends = hicolor-icon-theme - depends = lib32-glibc - depends = lib32-gcc-libs provides = calmly-writer=2.0.54 conflicts = calmly-writer options = !strip source = LICENSE.html::https://www.calmlywriter.com/eula.htm source = calmly-writer.sh sha256sums = 79f277c107ca3402d156db2ced6ea619a966216097c8d4d17692bada193b3edb - sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231 + sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014 source_aarch64 = calmly-writer_2.0.54-aarch64.deb::https://www.calmlywriter.com/releases/linux/deb/arm64/calmly-writer_2.0.54_arm64.deb sha256sums_aarch64 = dd7606298580fbf26c3882cdf83286db563680c9ef757cdceba6a605d8bbf11e source_x86_64 = calmly-writer_2.0.54-x86_64.deb::https://www.calmlywriter.com/releases/linux/deb/x64/calmly-writer_2.0.54_amd64.deb @@ -2,8 +2,8 @@ pkgname=calmly-writer-bin _pkgname="Calmly Writer" pkgver=2.0.54 -_electronversion=24 -pkgrel=5 +_electronversion=17 +pkgrel=6 pkgdesc="An editor designed to focus on what you want to tell, with a simple, unobtrusive and ease-to-use user interface." arch=( 'aarch64' @@ -17,8 +17,6 @@ options=('!strip') depends=( "electron${_electronversion}" 'hicolor-icon-theme' - 'lib32-glibc' - 'lib32-gcc-libs' ) source_aarch64=("${pkgname%-bin}_${pkgver}-aarch64.deb::${url}/releases/linux/deb/arm64/${pkgname%-bin}_${pkgver}_arm64.deb") source_x86_64=("${pkgname%-bin}_${pkgver}-x86_64.deb::${url}/releases/linux/deb/x64/${pkgname%-bin}_${pkgver}_amd64.deb") @@ -27,15 +25,15 @@ source=( "${pkgname%-bin}.sh" ) sha256sums=('79f277c107ca3402d156db2ced6ea619a966216097c8d4d17692bada193b3edb' - 'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231') + '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014') sha256sums_aarch64=('dd7606298580fbf26c3882cdf83286db563680c9ef757cdceba6a605d8bbf11e') sha256sums_x86_64=('91432bec316b83ef3a0e47815c4db9ec38903704e19c61e29f32782f327a3897') build() { sed -e "s|@electronversion@|${_electronversion}|" \ -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" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" } package() { diff --git a/calmly-writer.sh b/calmly-writer.sh index aacd8f895847..f9ced1432cfc 100644 --- a/calmly-writer.sh +++ b/calmly-writer.sh @@ -1,15 +1,14 @@ #!/bin/sh 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 NODE_ENV=production cd "${_APPDIR}" if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then - exec electron@electronversion@ "${_ASAR}" "$@" + exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $? else - exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@" -fi -exit
\ No newline at end of file + exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $? +fi
\ No newline at end of file |