fix errors

1 files changed, 33 insertions, 16 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0b40a02ee2dd..845b9ac93d31 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,31 +2,48 @@
 pkgname=macchatgpt
 _pkgname=MacChatGPT
 pkgver=1.0.0
-pkgrel=2
-pkgdesc="A macOS, Windows and Linux desktop application which runs ChatGPT easily and free of charge."
+_electronversion=23
+pkgrel=3
+pkgdesc="A desktop application which runs ChatGPT easily and free of charge."
 arch=('x86_64')
 url="https://github.com/justinhartman/MacChatGPT"
 license=("custom")
 conflicts=("${pkgname}")
-depends=('bash' 'electron23')
-makedepends=('gendesk' 'npm' 'nodejs')
-source=("${pkgname}-${pkgver}.zip::${url}/archive/refs/tags/${pkgver}.zip"
-    "${pkgname}.sh")
-sha256sums=('7b464dfdc568d29aaf55e897b768e6134aae16fe38bd3c4443b44668fbe849c4'
-            'b74b6d51eb9e5b57175157fc126a4fb0c91bc7191a0d92056e86f789f8c663c3')
-prepare() {
-    gendesk -q -f -n --categories "Utility" --name "${_pkgname}" --exec "${pkgname}"
-}
+depends=(
+    "electron${_electronversion}"
+)
+makedepends=(
+    'gendesk'
+    'npm'
+    'nodejs'
+    'git'
+)
+source=(
+    "${pkgname}-${pkgver}::git+${url}.git#tag=${pkgver}"
+    "${pkgname}.sh"
+)
+sha256sums=('SKIP'
+            '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
 build() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    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}"
+    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
-    asar pack "${srcdir}/${_pkgname}-${pkgver}/dist/build/${_pkgname}-linux-x64/resources/app" "${srcdir}/app.asar"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${srcdir}/app.asar" -t "${pkgdir}/opt/${pkgname}/resources"
-    install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/assets/icons/png/512x512.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    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"
     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}-${pkgver}/dist/build/${_pkgname}-linux-x64/LICENSE"* -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file