summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-02-04 13:19:45 +0800
committerzxp198210052024-02-04 13:19:45 +0800
commita16f4fad4920af98b509685fa93dbc4429aa74e9 (patch)
treeb9bb78bd5e8a7f1bfa0b9146e37ed75401596463
parent8279a8029e7126cc86d9c5d766d5142f15b446e2 (diff)
downloadaur-a16f4fad4920af98b509685fa93dbc4429aa74e9.tar.gz
fix errors
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD13
-rw-r--r--js-design.sh11
3 files changed, 13 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4e4db20504b7..422d0daab1f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,21 @@
pkgbase = js-design-appimage
pkgdesc = 即时设计 A professional UI design software tailored for Chinese designers.
pkgver = 1.0.6
- pkgrel = 5
+ pkgrel = 6
url = https://js.design
arch = x86_64
- license = GPL3
+ license = LicenseRef-custom
makedepends = squashfuse
depends = electron25
- depends = libx11
- depends = gdk-pixbuf2
- depends = libxext
+ depends = dbus-glib
depends = libdbusmenu-glib
depends = gtk2
- depends = dbus-glib
conflicts = js-design
source = js-design-1.0.6.AppImage::https://img.js.design/assets/download/%E5%8D%B3%E6%97%B6%E8%AE%BE%E8%AE%A1%20Linux%E7%89%88.AppImage
source = LICENSE.html
source = js-design.sh
sha256sums = 3697482be454c0191810f39b0b93eb3c28eb5e9c77c6c3ad0634269f8e1a2bd5
sha256sums = f1c8afcb7fbd3ad91d1f8b4bea8d66a21f9cb85be22b16ce652b66ca9473c616
- sha256sums = 5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf
+ sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
pkgname = js-design-appimage
diff --git a/PKGBUILD b/PKGBUILD
index 407545d3aac1..9c98fd1d8ee9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,20 +3,17 @@ _pkgname=js.design
pkgname="${_pkgname//./-}-appimage"
pkgver=1.0.6
_electronversion=25
-pkgrel=5
+pkgrel=6
pkgdesc="即时设计 A professional UI design software tailored for Chinese designers."
arch=("x86_64")
url="https://js.design"
-license=("GPL3")
+license=("LicenseRef-custom")
conflicts=("${pkgname%-appimage}")
depends=(
"electron${_electronversion}"
- 'libx11'
- 'gdk-pixbuf2'
- 'libxext'
+ 'dbus-glib'
'libdbusmenu-glib'
'gtk2'
- 'dbus-glib'
)
makedepends=(
'squashfuse'
@@ -28,11 +25,11 @@ source=(
)
sha256sums=('3697482be454c0191810f39b0b93eb3c28eb5e9c77c6c3ad0634269f8e1a2bd5'
'f1c8afcb7fbd3ad91d1f8b4bea8d66a21f9cb85be22b16ce652b66ca9473c616'
- '5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf')
+ '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
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%-appimage}.sh"
chmod a+x "${srcdir}/${pkgname%-appimage}-${pkgver}.AppImage"
"${srcdir}/${pkgname%-appimage}-${pkgver}.AppImage" --appimage-extract > /dev/null
diff --git a/js-design.sh b/js-design.sh
index c77c53567639..f9ced1432cfc 100644
--- a/js-design.sh
+++ b/js-design.sh
@@ -1,17 +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
- cd "${_APPDIR}"
- exec electron@electronversion@ "${_ASAR}" "$@"
- exit
+ exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
else
- cd "${_APPDIR}"
- exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
- exit
+ exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
fi \ No newline at end of file