fix errors

3 files changed, 35 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 81f1a913b069..5e53e1ec29e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,10 @@
 pkgbase = macchatgpt
 	pkgdesc = A desktop application which runs ChatGPT easily and free of charge.
 	pkgver = 1.0.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/justinhartman/MacChatGPT
+	arch = aarch64
+	arch = armv7h
 	arch = x86_64
 	license = custom
 	makedepends = gendesk
@@ -11,9 +13,9 @@ pkgbase = macchatgpt
 	makedepends = git
 	depends = electron23
 	conflicts = macchatgpt
-	source = macchatgpt-1.0.0::git+https://github.com/justinhartman/MacChatGPT.git#tag=1.0.0
+	source = macchatgpt.git::git+https://github.com/justinhartman/MacChatGPT.git#tag=1.0.0
 	source = macchatgpt.sh
 	sha256sums = SKIP
-	sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
+	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
 
 pkgname = macchatgpt
diff --git a/PKGBUILD b/PKGBUILD
index 845b9ac93d31..7def4778ef7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,13 @@ pkgname=macchatgpt
 _pkgname=MacChatGPT
 pkgver=1.0.0
 _electronversion=23
-pkgrel=3
+pkgrel=4
 pkgdesc="A desktop application which runs ChatGPT easily and free of charge."
-arch=('x86_64')
+arch=(
+    'aarch64'
+    'armv7h'
+    'x86_64'
+)
 url="https://github.com/justinhartman/MacChatGPT"
 license=("custom")
 conflicts=("${pkgname}")
@@ -19,31 +23,41 @@ makedepends=(
     'git'
 )
 source=(
-    "${pkgname}-${pkgver}::git+${url}.git#tag=${pkgver}"
+    "${pkgname}.git::git+${url}.git#tag=${pkgver}"
     "${pkgname}.sh"
 )
 sha256sums=('SKIP'
-            '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
+            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname}|g" \
         -e "s|@appasar@|app|g" \
         -i "${srcdir}/${pkgname}.sh"
     gendesk -q -f -n --categories "Utility" --name "${_pkgname}" --exec "${pkgname}"
-    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}"
     npm install
-    npm run package:linux:x64
+    case "${CARCH}" in
+        aarch64)
+            npm run package:linux:arm64
+        ;;
+        armv7h)
+            npm run package:linux:arm
+        ;;
+        x86_64)
+            npm run package:linux:x64
+        ;;
+    esac
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
     install -Dm755 -d "${pkgdir}/usr/lib/${pkgname}"
-    cp -r "${srcdir}/${pkgname}-${pkgver}/dist/build/${_pkgname}-linux-x64/resources/app" "${pkgdir}/usr/lib/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/assets/icons/png/512x512.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    cp -r "${srcdir}/${pkgname}.git/dist/build/${_pkgname}-linux-"*/resources/app "${pkgdir}/usr/lib/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname}.git/assets/icons/png/512x512.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist/build/${_pkgname}-linux-x64/LICENSE"* -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname}.git/dist/build/${_pkgname}-linux-"*/LICENSE* -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/macchatgpt.sh b/macchatgpt.sh
index 2ec4412e5c4f..aacd8f895847 100644
--- a/macchatgpt.sh
+++ b/macchatgpt.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