summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-06-03 23:15:43 +0800
committerzxp198210052024-06-03 23:15:43 +0800
commit6a949216d921e0c3f9d6639a17827ecb29643ec7 (patch)
tree909e58ee949f3fe809c1301910e671254e3f1e2a
parent04ed8e525ebc1bac566a6bbb09a1cb027b89aa4c (diff)
downloadaur-6a949216d921e0c3f9d6639a17827ecb29643ec7.tar.gz
update to 24.03.4
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD13
-rw-r--r--backend-ai-desktop.sh22
3 files changed, 31 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 55749008958d..0482dc3dbf5e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,24 @@
pkgbase = backend-ai-desktop-bin
pkgdesc = Provides a convenient environment for users, while allowing various commands to be executed without CLI. It also provides some visual features that are not provided by the CLI, such as dashboards and statistics.
- pkgver = 24.03.3
+ pkgver = 24.03.4
pkgrel = 1
url = https://www.backend.ai/
arch = aarch64
arch = x86_64
license = LGPL-3.0-or-later
makedepends = gendesk
- depends = electron29
- provides = backend-ai-desktop=24.03.3
+ depends = electron30
+ provides = backend-ai-desktop=24.03.4
conflicts = backend-ai-desktop
conflicts = backend.ai
conflicts = backend.ai-desktop
- source = backend-ai-desktop-24.03.3.png::https://raw.githubusercontent.com/lablup/backend.ai-webui/v24.03.3/manifest/backend-ai.iconset/icon_512x512%401x.png
+ source = backend-ai-desktop-24.03.4.png::https://raw.githubusercontent.com/lablup/backend.ai-webui/v24.03.4/manifest/backend-ai.iconset/icon_512x512%401x.png
source = backend-ai-desktop.sh
sha256sums = c54209c33c387908bfaae40a9c5f6c96bacaa52684f2546068e2b4441f4a53b3
- sha256sums = 61d56055897e9d71d68e185ac2de7c4cb2fbca16eb3fb0091703612c113441f3
- source_aarch64 = backend-ai-desktop-24.03.3-aarch64.zip::https://github.com/lablup/backend.ai-webui/releases/download/v24.03.3/backend.ai-desktop-24.03.3-linux-arm64.zip
- sha256sums_aarch64 = 912a2e430b66150da353c32e1669492eaec303ec31f121dacfd5c5af5e4d6df6
- source_x86_64 = backend-ai-desktop-24.03.3-x86_64.zip::https://github.com/lablup/backend.ai-webui/releases/download/v24.03.3/backend.ai-desktop-24.03.3-linux-x64.zip
- sha256sums_x86_64 = 5b97fce4dfc6d965a1d81e3fc3f421694b3b7e6a10d8fa210849609c193d1918
+ sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051
+ source_aarch64 = backend-ai-desktop-24.03.4-aarch64.zip::https://github.com/lablup/backend.ai-webui/releases/download/v24.03.4/backend.ai-desktop-24.03.4-linux-arm64.zip
+ sha256sums_aarch64 = 900b32a6f0a3686e8b6e87fa0e5897d15ecfc39cef2121a27a4aee405c9a6ece
+ source_x86_64 = backend-ai-desktop-24.03.4-x86_64.zip::https://github.com/lablup/backend.ai-webui/releases/download/v24.03.4/backend.ai-desktop-24.03.4-linux-x64.zip
+ sha256sums_x86_64 = 42b662d56dd422c8dbdc223cb5610d799429e4452577411722180c05fadf9b9d
pkgname = backend-ai-desktop-bin
diff --git a/PKGBUILD b/PKGBUILD
index b6f40e08e303..976e0f3e8794 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
_pkgname=backend.ai-desktop
pkgname="${_pkgname//./-}-bin"
_appname="Backend.AI Desktop"
-pkgver=24.03.3
-_electronversion=29
+pkgver=24.03.4
+_electronversion=30
pkgrel=1
pkgdesc="Provides a convenient environment for users, while allowing various commands to be executed without CLI. It also provides some visual features that are not provided by the CLI, such as dashboards and statistics."
arch=(
@@ -32,16 +32,17 @@ source=(
"${pkgname%-bin}.sh"
)
sha256sums=('c54209c33c387908bfaae40a9c5f6c96bacaa52684f2546068e2b4441f4a53b3'
- '61d56055897e9d71d68e185ac2de7c4cb2fbca16eb3fb0091703612c113441f3')
-sha256sums_aarch64=('912a2e430b66150da353c32e1669492eaec303ec31f121dacfd5c5af5e4d6df6')
-sha256sums_x86_64=('5b97fce4dfc6d965a1d81e3fc3f421694b3b7e6a10d8fa210849609c193d1918')
+ '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051')
+sha256sums_aarch64=('900b32a6f0a3686e8b6e87fa0e5897d15ecfc39cef2121a27a4aee405c9a6ece')
+sha256sums_x86_64=('42b662d56dd422c8dbdc223cb5610d799429e4452577411722180c05fadf9b9d')
build() {
sed -e "s|@electronversion@|${_electronversion}|" \
-e "s|@appname@|${pkgname%-bin}|g" \
-e "s|@runname@|app.asar|g" \
+ -e "s|@cfgdirname@|${_appname}|g" \
-e "s|@options@|env ELECTRON_OZONE_PLATFORM_HINT=auto|g" \
-i "${srcdir}/${pkgname%-bin}.sh"
- gendesk -q -f -n --pkgname="${_pkgname//./-}-bin" --categories="Development" --name="${pkgname%-bin}" --exec="${pkgname%-bin} %U"
+ gendesk -q -f -n --pkgname="${pkgname%-bin}" --pkgdesc="${pkgdesc}" --categories="Development" --name="${pkgname%-bin}" --exec="${pkgname%-bin} %U"
asar e "${srcdir}/${_appname}-linux-"*/resources/app.asar "${srcdir}/app.asar.unpacked"
}
package() {
diff --git a/backend-ai-desktop.sh b/backend-ai-desktop.sh
index 842c77e19b1d..4cfe3ac09dd8 100644
--- a/backend-ai-desktop.sh
+++ b/backend-ai-desktop.sh
@@ -1,21 +1,29 @@
#!/bin/bash
-set -e
+set -o pipefail
_APPDIR="/usr/lib/@appname@"
_RUNNAME="${_APPDIR}/@runname@"
+_CFGDIR="@cfgdirname@/"
_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 ELECTRON_DISABLE_SECURITY_WARNINGS=true
+export ELECTRON_OVERRIDE_DIST_PATH="/usr/bin/electron@electronversion@"
export NODE_ENV=production
export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
-_FLAGS_FILE="${XDG_CONFIG_HOME}/@appname@-flags.conf"
-if [ -r "${_FLAGS_FILE}" ]; then
- _USER_FLAGS="$(cat "${_FLAGS_FILE}")"
+export _FLAGS_FILE="${XDG_CONFIG_HOME}/${_CFGDIR}@appname@-flags.conf"
+declare -a _USER_FLAGS
+if [[ -f "${_FLAGS_FILE}" ]]; then
+ while read -r line; do
+ if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then
+ _USER_FLAGS+=("${line}")
+ fi
+ done < "${_FLAGS_FILE}"
fi
cd "${_APPDIR}"
-if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
- exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS}" "$@" || exit $?
+if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then
+ exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} "${_USER_FLAGS[@]}" "$@"
else
- exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS}" "$@" || exit $?
+ exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} --no-sandbox "${_USER_FLAGS[@]}" "$@"
fi \ No newline at end of file