summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-01-16 17:30:15 +0800
committerzxp198210052024-01-16 17:30:15 +0800
commit3b0fce1f64b432f1b4c9d83d7d58c917a624b41d (patch)
tree0343d1404478d724fda22ef661fc6a8ce7a97384
parent7795e19266e03f449541e97a2130eb36b89d8e7c (diff)
downloadaur-3b0fce1f64b432f1b4c9d83d7d58c917a624b41d.tar.gz
fix errors
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD12
-rw-r--r--jsonbox.sh13
3 files changed, 16 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 123db536c4ec..8e2101606974 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,13 @@
pkgbase = jsonbox-bin
pkgdesc = A cross platform JSON formatting tool跨平台的json格式化工具
pkgver = 2.3.1
- pkgrel = 1
+ pkgrel = 2
url = https://docs.r-xnoro.com/jsonbox
arch = x86_64
license = Apache
+ makedepends = squashfuse
depends = electron19
depends = hicolor-icon-theme
- depends = libx11
- depends = gdk-pixbuf2
- depends = libxext
depends = libdbusmenu-glib
depends = gtk2
depends = dbus-glib
@@ -18,6 +16,6 @@ pkgbase = jsonbox-bin
source = jsonbox-2.3.1.AppImage::https://docs.r-xnoro.com/jsonbox/dist/jsonbox-2.3.1-linux-x86_64.AppImage
source = jsonbox.sh
sha256sums = 10971c1196d1e729d10f58e352afb4c4872458a910d2b55b16c670d4becb6a7f
- sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
+ sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
pkgname = jsonbox-bin
diff --git a/PKGBUILD b/PKGBUILD
index ecc8e05f2ff8..0874b2ed3a56 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=jsonbox-bin
pkgver=2.3.1
_electronversion=19
-pkgrel=1
+pkgrel=2
pkgdesc="A cross platform JSON formatting tool跨平台的json格式化工具"
arch=('x86_64')
url="https://docs.r-xnoro.com/jsonbox"
@@ -13,19 +13,19 @@ provides=("${pkgname%-bin}=${pkgver}")
depends=(
"electron${_electronversion}"
'hicolor-icon-theme'
- 'libx11'
- 'gdk-pixbuf2'
- 'libxext'
'libdbusmenu-glib'
'gtk2'
'dbus-glib'
)
+makedepends=(
+ 'squashfuse'
+)
source=(
"${pkgname%-bin}-${pkgver}.AppImage::${url}/dist/${pkgname%-bin}-${pkgver}-linux-${CARCH}.AppImage"
"${pkgname%-bin}.sh"
)
sha256sums=('10971c1196d1e729d10f58e352afb4c4872458a910d2b55b16c670d4becb6a7f'
- '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
+ 'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
build() {
sed -e "s|@electronversion@|${_electronversion}|" \
-e "s|@appname@|${pkgname%-bin}|g" \
@@ -33,7 +33,7 @@ build() {
-i "${srcdir}/${pkgname%-bin}.sh"
chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage"
"${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null
- sed "s|AppRun --no-sandbox %U|${pkgname%-bin}|g" -i "${srcdir}/squashfs-root/${pkgname%-bin}.desktop"
+ sed "s|AppRun --no-sandbox|${pkgname%-bin}|g" -i "${srcdir}/squashfs-root/${pkgname%-bin}.desktop"
}
package() {
install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
diff --git a/jsonbox.sh b/jsonbox.sh
index 2ec4412e5c4f..aacd8f895847 100644
--- a/jsonbox.sh
+++ b/jsonbox.sh
@@ -1,14 +1,15 @@
-#!/bin/bash
+#!/bin/sh
set -e
_APPDIR="/usr/lib/@appname@"
+_ASAR="${_APPDIR}/@appasar@"
export PATH="${_APPDIR}:${PATH}"
-export ELECTRON_IS_DEV=0
export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
-_ASAR="${_APPDIR}/@appasar@"
+export ELECTRON_IS_DEV=0
+export NODE_ENV=production
+cd "${_APPDIR}"
if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
- cd "${_APPDIR}"
exec electron@electronversion@ "${_ASAR}" "$@"
else
- cd "${_APPDIR}"
exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-fi \ No newline at end of file
+fi
+exit \ No newline at end of file