From fe7f0fe704abb2f8af27f9c0635f7c77040a2622 Mon Sep 17 00:00:00 2001 From: zxp19821005 Date: Mon, 18 Mar 2024 18:36:29 +0800 Subject: [PATCH] fix errors --- .SRCINFO | 6 +++--- PKGBUILD | 7 ++++--- postybirb.sh | 8 +++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index b93700bd61c8..894b1387d7d0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,11 +1,11 @@ pkgbase = postybirb-bin pkgdesc = An application that helps artists post art and other multimedia to multiple websites more quickly. pkgver = 2.3.44 - pkgrel = 5 + pkgrel = 6 url = https://www.postybirb.com/ arch = x86_64 license = BSD-3-Clause - depends = electron13 + depends = electron13-bin provides = postybirb=2.3.44 conflicts = postybirb conflicts = postybirb-plus @@ -14,6 +14,6 @@ pkgbase = postybirb-bin source = postybirb.sh sha256sums = 45dc119851f148344b3601f5a00de67e00d2575f9dd616bcbd82d4eeda97b49d sha256sums = 12e65eb62d705f4cf38eb2f7b382206fb3155fbdbff559f87c702a5e1c1c2207 - sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014 + sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 pkgname = postybirb-bin diff --git a/PKGBUILD b/PKGBUILD index b726b0954475..6db1f70c2536 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=postybirb-bin _pkgname=PostyBirb pkgver=2.3.44 _electronversion=13 -pkgrel=5 +pkgrel=6 pkgdesc="An application that helps artists post art and other multimedia to multiple websites more quickly." arch=('x86_64') url="https://www.postybirb.com/" @@ -15,7 +15,7 @@ conflicts=( "${pkgname%-bin}-plus" ) depends=( - "electron${_electronversion}" + "electron${_electronversion}-bin" ) source=( "${pkgname%-bin}-${pkgver}.AppImage::${_ghurl}/releases/download/v${pkgver}/${_pkgname}-${pkgver}.AppImage" @@ -24,11 +24,12 @@ source=( ) sha256sums=('45dc119851f148344b3601f5a00de67e00d2575f9dd616bcbd82d4eeda97b49d' '12e65eb62d705f4cf38eb2f7b382206fb3155fbdbff559f87c702a5e1c1c2207' - '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014') + 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname%-bin}|g" \ -e "s|@runname@|app.asar|g" \ + -e "s|@options@||g" \ -i "${srcdir}/${pkgname%-bin}.sh" chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null diff --git a/postybirb.sh b/postybirb.sh index f9ced1432cfc..7ddcaab8d734 100644 --- a/postybirb.sh +++ b/postybirb.sh @@ -1,14 +1,16 @@ -#!/bin/sh +#!/bin/bash set -e _APPDIR="/usr/lib/@appname@" _RUNNAME="${_APPDIR}/@runname@" +_OPTIONS="@options@" 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@ "${_RUNNAME}" "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $? else - exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $? fi \ No newline at end of file