fix errors

3 files changed, 35 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c8d743c6f8e5..dd452ea1cb7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = houdunren-camera
 	pkgdesc = Desktop camera software that can be used for online live streaming, distance learning, and video conferencing.桌面摄像头软件，可用于在线直播、远程教学、视频会议
 	pkgver = 1.0.67
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.houdunren.com/
 	arch = any
 	license = MIT
 	depends = electron25
 	conflicts = houdunren-camera
-	source = houdunren-camera-1.0.67::git+https://github.com/houdunwang/camera.git#tag=v1.0.67
+	source = houdunren-camera.git::git+https://github.com/houdunwang/camera.git#tag=v1.0.67
 	source = houdunren-camera.sh
 	sha256sums = SKIP
-	sha256sums = 8e170ca0729ccdad6246cfae3c8ad35227a12fcc83574306e46d88b1d876c2c5
+	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
 
 pkgname = houdunren-camera
diff --git a/PKGBUILD b/PKGBUILD
index 440bc545a6f3..128726db5fcf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=houdunren-camera
 pkgver=1.0.67
 _electronversion=25
-pkgrel=3
+pkgrel=4
 pkgdesc="Desktop camera software that can be used for online live streaming, distance learning, and video conferencing.桌面摄像头软件，可用于在线直播、远程教学、视频会议"
 arch=('any')
 url="https://www.houdunren.com/"
@@ -13,43 +13,47 @@ depends=(
     "electron${_electronversion}"
 )
 mkdenpends=(
-    'nodejs>=20'
+    'nodejs'
     'pnpm'
     'gendesk'
     'npm'
     'git'
 )
 source=(
-    "${pkgname}-${pkgver}::git+${_ghurl}.git#tag=v${pkgver}"
+    "${pkgname}.git::git+${_ghurl}.git#tag=v${pkgver}"
     "${pkgname}.sh"
 )
 sha256sums=('SKIP'
-            '8e170ca0729ccdad6246cfae3c8ad35227a12fcc83574306e46d88b1d876c2c5')
+            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
 build() {
+    sed -e "s|@electronversion@|${_electronversion}|" \
+        -e "s|@appname@|${pkgname}|g" \
+        -e "s|@appasar@|app.asar|g" \
+        -i "${srcdir}/${pkgname}.sh"
     gendesk -f -n -q --categories "Utility" --name "${pkgname}" --exec "${pkgname}"
-    sed "s|@electronversion@|${_electronversion}|" -i "${srcdir}/${pkgname%-git}.sh"
-    cd "${srcdir}/${pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}.git"
     export npm_config_build_from_source=true
-    export npm_config_cache="${srcdir}/npm_cache"
     export ELECTRON_SKIP_BINARY_DOWNLOAD=1
     export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
     export ELECTRONVERSION="${_electronversion}"
-    sed -e '/- snap/d' -e '/- deb/d' -i electron-builder.yml
+    pnpm config set store-dir "${srcdir}/.pnpm_store"
+    pnpm config set cache-dir "${srcdir}/.pnpm_cache"
+    pnpm config set link-workspace-packages true
+    sed '/- snap/d;/- deb/d' -i electron-builder.yml
     pnpm install
-    pnpm build:linux
-    cp "${srcdir}/${pkgname}-${pkgver}/dist/.icon-set/icon_16x16.png" "${srcdir}/${pkgname}-${pkgver}/dist/.icon-set/icon_16.png"
-    cp "${srcdir}/${pkgname}-${pkgver}/dist/.icon-set/icon_48x48.png" "${srcdir}/${pkgname}-${pkgver}/dist/.icon-set/icon_48.png"
+    pnpm run build:linux
+    cp "${srcdir}/${pkgname}.git/dist/.icon-set/icon_16x16.png" "${srcdir}/${pkgname}.git/dist/.icon-set/icon_16.png"
+    cp "${srcdir}/${pkgname}.git/dist/.icon-set/icon_48x48.png" "${srcdir}/${pkgname}.git/dist/.icon-set/icon_48.png"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist/linux-unpacked/resources/app.asar" \
-        -t "${pkgdir}/usr/lib/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist/linux-unpacked/resources/app.asar.unpacked/resources/"* \
+    install -Dm644 "${srcdir}/${pkgname}.git/dist/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname}.git/dist/linux-"*/resources/app.asar.unpacked/resources/* \
         -t "${pkgdir}/usr/lib/${pkgname}/app.asar.unpacked/resources"
     for _icons in 16 32 48 64 128 256 512 1024;do
-        install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist/.icon-set/icon_${_icons}.png" \
+        install -Dm644 "${srcdir}/${pkgname}.git/dist/.icon-set/icon_${_icons}.png" \
             "${pkgdir}/usr/share/icons/hicolor/${_icons}x${_icons}/apps/${pkgname}.png"
     done
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname}.git/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
 }
\ No newline at end of file
diff --git a/houdunren-camera.sh b/houdunren-camera.sh
index b769a817d838..aacd8f895847 100644
--- a/houdunren-camera.sh
+++ b/houdunren-camera.sh
@@ -1,12 +1,15 @@
-#!/bin/bash
-APPDIR="/usr/lib/houdunren-camera"
-export PATH="${APPDIR}:${PATH}"
+#!/bin/sh
+set -e
+_APPDIR="/usr/lib/@appname@"
+_ASAR="${_APPDIR}/@appasar@"
+export PATH="${_APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
 export ELECTRON_IS_DEV=0
-_ASAR="${APPDIR}/app.asar"
+export NODE_ENV=production
+cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    cd "$APPDIR"
-    exec electron@electronversion@ ${_ASAR} "$@"
+    exec electron@electronversion@ "${_ASAR}" "$@"
 else
-    cd "$APPDIR"
-    exec electron@electronversion@ ${_ASAR} --no-sandbox "$@"
-fi
\ No newline at end of file
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
+fi
+exit
\ No newline at end of file