fix errors

3 files changed, 23 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 68267292d30a..68b5b90c7051 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,7 +3,9 @@ pkgbase = motrix-git
 	pkgver = 1.8.19.r30.g7012040
 	pkgrel = 1
 	url = https://motrix.app/
-	arch = any
+	arch = aarch64
+	arch = armv7h
+	arch = x86_64
 	license = MIT
 	makedepends = gendesk
 	makedepends = git
@@ -14,9 +16,9 @@ pkgbase = motrix-git
 	depends = electron22
 	provides = motrix=1.8.19.r30.g7012040
 	conflicts = motrix
-	source = motrix.git::git+https://gitee.com/mirrors/motrix.git
+	source = motrix.git::git+https://github.com/agalwood/Motrix.git
 	source = motrix.sh
 	sha256sums = SKIP
-	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
+	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
 
 pkgname = motrix-git
diff --git a/PKGBUILD b/PKGBUILD
index 8703228e011a..6900ef9fff20 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,11 @@ _electronversion=22
 _nodeversion=16
 pkgrel=1
 pkgdesc="A full-featured download manager that supports downloading HTTP, FTP, BitTorrent, Magnet, etc."
-arch=('any')
+arch=(
+    'aarch64'
+    'armv7h'
+    'x86_64'
+)
 url="https://motrix.app/"
 _ghurl="https://github.com/agalwood/Motrix"
 _giteeurl="https://gitee.com/mirrors/motrix"
@@ -26,11 +30,11 @@ makedepends=(
     'curl'
 )
 source=(
-    "${pkgname//-/.}::git+${_giteeurl}.git"
+    "${pkgname//-/.}::git+${_ghurl}.git"
     "${pkgname%-git}.sh"
 )
 sha256sums=('SKIP'
-            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
+            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
 pkgver() {
     cd "${srcdir}/${pkgname//-/.}"
     git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
@@ -44,18 +48,20 @@ _ensure_local_nvm() {
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-git}|g" \
-        -e "s|@appasar@|app.asar|g" \
+        -e "s|@runname@|app.asar|g" \
         -i "${srcdir}/${pkgname%-git}.sh"
-    #_ensure_local_nvm
-    gendesk -q -f -n --categories "Network" --name "${_pkgname}" --exec "${pkgname%-git} %U"
+    _ensure_local_nvm
+    gendesk -q -f -n --categories="Network" --name="${_pkgname}" --exec="${pkgname%-git} %U"
     cd "${srcdir}/${pkgname//-/.}"
     export npm_config_build_from_source=true
     export ELECTRON_SKIP_BINARY_DOWNLOAD=1
     export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
+    export npm_config_target="${SYSTEM_ELECTRON_VERSION}"
     export ELECTRONVERSION="${_electronversion}"
+    HOME="${srcdir}/.electron-gyp"
     sed '161,180d' -i electron-builder.json
-    #yarn install --cache-folder "${srcdir}/.yarn_cache"
-    #yarn lint:fix
+    yarn install --cache-folder "${srcdir}/.yarn_cache"
+    yarn lint:fix
     yarn run build
 }
 package() {
diff --git a/motrix.sh b/motrix.sh
index aacd8f895847..f9ced1432cfc 100644
--- a/motrix.sh
+++ b/motrix.sh
@@ -1,15 +1,14 @@
 #!/bin/sh
 set -e
 _APPDIR="/usr/lib/@appname@"
-_ASAR="${_APPDIR}/@appasar@"
+_RUNNAME="${_APPDIR}/@runname@"
 export PATH="${_APPDIR}:${PATH}"
 export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
 export ELECTRON_IS_DEV=0
 export NODE_ENV=production
 cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec electron@electronversion@ "${_ASAR}" "$@"
+    exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
 else
-    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-fi
-exit
\ No newline at end of file
+    exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+fi
\ No newline at end of file