update to 1.2.3

3 files changed, 22 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 45b7faddc276..365cf585a73f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,41 +1,21 @@
 pkgbase = angular-electron-bin
 	pkgdesc = Bootstrap and package your project with Angular 15 and Electron 21 (Typescript + SASS + Hot Reload) for creating Desktop applications.
-	pkgver = 1.2.2
+	pkgver = 1.2.3
 	pkgrel = 1
 	url = https://github.com/malacration/sap-front
 	arch = x86_64
 	license = MIT
 	makedepends = gendesk
-	depends = cairo
-	depends = libx11
-	depends = libxcb
-	depends = libdrm
-	depends = libcups
-	depends = gcc-libs
-	depends = alsa-lib
-	depends = libxext
-	depends = libxkbcommon
-	depends = at-spi2-core
-	depends = glibc
-	depends = gtk3
-	depends = libxfixes
-	depends = nss
-	depends = libxcomposite
-	depends = expat
-	depends = pango
-	depends = glib2
-	depends = mesa
-	depends = libxrandr
-	depends = dbus
-	depends = libxdamage
-	depends = nspr
+	depends = electron
 	conflicts = angular-electron
 	conflicts = angular-electron-appimage
-	source = angular-electron-1.2.2.tar.gz::https://github.com/malacration/sap-front/releases/download/v1.2.2/angular-electron-12.0.0.tar.gz
+	source = angular-electron-1.2.3.tar.gz::https://github.com/malacration/sap-front/releases/download/v1.2.3/angular-electron-12.0.0.tar.gz
 	source = LICENSE.md::https://raw.githubusercontent.com/malacration/sap-front/main/LICENSE.md
 	source = angular-electron.png::https://raw.githubusercontent.com/malacration/sap-front/main/src/assets/icons/favicon.512x512.png
-	sha256sums = bd4a8cf2599295d691e595440050ac5130b7ecc01cd02df58a3fb1026de11ae9
+	source = angular-electron.sh
+	sha256sums = 7c49c17274773a65b726857f49f410b0b170c89ca3d0077dff83cda5c8573c69
 	sha256sums = 00df8834a94ab4d44c7c7d6557cce6af143ed0019a80c682b5a03d0cea8187b4
 	sha256sums = e88e5f0dc9ca423464c686e2100c7ff48e88474401f099086151a3b13be52c4b
+	sha256sums = 342c23ee9e97a95c124321183d869a34f5c782e1814875a0eba0b0e1c974b170
 
 pkgname = angular-electron-bin
diff --git a/PKGBUILD b/PKGBUILD
index 1774f729c96e..72cb9052c37d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,27 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=angular-electron-bin
-pkgver=1.2.2
+pkgver=1.2.3
 pkgrel=1
 pkgdesc="Bootstrap and package your project with Angular 15 and Electron 21 (Typescript + SASS + Hot Reload) for creating Desktop applications."
 arch=('x86_64')
 url="https://github.com/malacration/sap-front"
 license=('MIT')
 conflicts=("${pkgname%-bin}" "${pkgname%-bin}-appimage")
-depends=('cairo' 'libx11' 'libxcb' 'libdrm' 'libcups' 'gcc-libs' 'alsa-lib' 'libxext' 'libxkbcommon' 'at-spi2-core' 'glibc' \
-    'gtk3' 'libxfixes' 'nss' 'libxcomposite' 'expat' 'pango' 'glib2' 'mesa' 'libxrandr' 'dbus' 'libxdamage' 'nspr')
+depends=('electron')
 makedepends=('gendesk')
 source=("${pkgname%-bin}-${pkgver}.tar.gz::${url}/releases/download/v${pkgver}/${pkgname%-bin}-12.0.0.tar.gz"
     "LICENSE.md::https://raw.githubusercontent.com/malacration/sap-front/main/LICENSE.md"
-    "${pkgname%-bin}.png::https://raw.githubusercontent.com/malacration/sap-front/main/src/assets/icons/favicon.512x512.png")
-sha256sums=('bd4a8cf2599295d691e595440050ac5130b7ecc01cd02df58a3fb1026de11ae9'
+    "${pkgname%-bin}.png::https://raw.githubusercontent.com/malacration/sap-front/main/src/assets/icons/favicon.512x512.png"
+    "${pkgname%-bin}.sh")
+sha256sums=('7c49c17274773a65b726857f49f410b0b170c89ca3d0077dff83cda5c8573c69'
             '00df8834a94ab4d44c7c7d6557cce6af143ed0019a80c682b5a03d0cea8187b4'
-            'e88e5f0dc9ca423464c686e2100c7ff48e88474401f099086151a3b13be52c4b')
+            'e88e5f0dc9ca423464c686e2100c7ff48e88474401f099086151a3b13be52c4b'
+            '342c23ee9e97a95c124321183d869a34f5c782e1814875a0eba0b0e1c974b170')
 package() {
-    install -Dm755 -d "${pkgdir}/opt/${pkgname%-bin}"
-    cp -r "${srcdir}/${pkgname%-bin}-12.0.0/"* "${pkgdir}/opt/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/${pkgname%-bin}-12.0.0/resources/app.asar" -t "${pkgdir}/opt/${pkgname%-bin}"
+    install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}"
     install -Dm644 "${srcdir}/LICENSE.md" -t "${pkgdir}/usr/share/licenses/${pkgname}"
     install -Dm644 "${srcdir}/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
-    gendesk -f --icon "${pkgname%-bin}" --categories "Development;Utility" --name "Angular Electron" --exec "/opt/${pkgname%-bin}/${pkgname%-bin} %U"
+    gendesk -f -n --icon "${pkgname%-bin}" --categories "Development;Utility" --name "Angular Electron" --exec "/opt/${pkgname%-bin}/${pkgname%-bin}"
     install -Dm644 "${srcdir}/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
 }
\ No newline at end of file
diff --git a/angular-electron.sh b/angular-electron.sh
new file mode 100644
index 000000000000..8d8c9dfc8997
--- /dev/null
+++ b/angular-electron.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
+    exec electron /opt/angular-electron/app.asar "$@"
+else
+    exec electron --no-sandbox /opt/angular-electron/app.asar "$@"
+fi
\ No newline at end of file