upgpkg: motrix@1.8.14

2 files changed, 32 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e6a93b59f05a..a12b1b9bf78a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,22 @@
 pkgbase = motrix
 	pkgdesc = A full-featured download manager (release version)
-	pkgver = 1.6.11
-	pkgrel = 4
+	pkgver = 1.8.14
+	pkgrel = 1
 	url = https://github.com/agalwood/Motrix
 	arch = x86_64
 	license = MIT
-	makedepends = aria2-fast
 	makedepends = npm
 	makedepends = yarn
-	makedepends = nodejs<17
+	makedepends = nodejs
 	depends = gtk3
 	depends = libxcb
 	depends = electron
 	conflicts = motrix-git
 	source = motrix.desktop
 	source = motrix
-	source = Motrix.tar.gz::https://github.com/agalwood/Motrix/archive/v1.6.11.tar.gz
+	source = Motrix.tar.gz::https://github.com/agalwood/Motrix/archive/v1.8.14.tar.gz
 	sha256sums = af5092a2a599bd23c13303ad1e7b745992a7af141278d13abe4297ca50a77bd8
-	sha256sums = 52a8f1ae5916a91aa1c9f1749e06777b4457bd9f5a03749c9fcd97e7d0801a71
+	sha256sums = becf35e632c6124792a2c8ee9233f3357ffbee08b81820c3f41bdbb5a2a7ead0
 	sha256sums = 9a1558063d32dd100aa289db601f01497d518c070f0ba570efd446830697089e
 
 pkgname = motrix
diff --git a/PKGBUILD b/PKGBUILD
index 7ce4e2dcec7f..adcb8f69421f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,9 @@
 # Maintainer: zhullyb <zhullyb [at] outlook dot com>
-# Contributor: sukanka <su975853527 [AT] gmail dot com>
 # Contributor: weearc <q19981121 [at] 163 dot com>
 pkgname=motrix
 _pkgname=Motrix
-pkgver=1.6.11
-pkgrel=4
+pkgver=1.8.14
+pkgrel=1
 epoch=
 pkgdesc="A full-featured download manager (release version)"
 arch=("x86_64")
@@ -12,7 +11,7 @@ url="https://github.com/agalwood/Motrix"
 license=('MIT')
 groups=()
 depends=('gtk3' 'libxcb' 'electron')
-makedepends=('aria2-fast' 'npm' 'yarn' "nodejs<17")
+makedepends=('npm' 'yarn' "nodejs")
 checkdepends=()
 optdepends=()
 provides=()
@@ -24,52 +23,43 @@ install=
 changelog=
 source=("motrix.desktop"
     "motrix"
-    "Motrix.tar.gz"::"https://github.com/agalwood/Motrix/archive/v${pkgver}.tar.gz"
-    )
+    "Motrix.tar.gz"::"https://github.com/agalwood/Motrix/archive/v${pkgver}.tar.gz")
 noextract=()
 sha256sums=('af5092a2a599bd23c13303ad1e7b745992a7af141278d13abe4297ca50a77bd8'
             '52a8f1ae5916a91aa1c9f1749e06777b4457bd9f5a03749c9fcd97e7d0801a71'
-            '9a1558063d32dd100aa289db601f01497d518c070f0ba570efd446830697089e')
+            '3b709583403c84e597feeee78a9fee7211e46972dfaf8e2075b7a278eb54f74c')
 validpgpkeys=()
 
+#_ensure_local_nvm() {
+    # let's be sure we are starting clean
+#    which nvm >/dev/null 2>&1 && nvm deactivate && nvm unload
+#    export NVM_DIR="${srcdir}/.nvm"
+
+    # The init script returns 3 if version specified
+    # in ./.nvrc is not (yet) installed in $NVM_DIR
+    # but nvm itself still gets loaded ok
+#    source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
+#}
+
 prepare() {
-    cd $srcdir/${_pkgname}-${pkgver}
-    # Fix pack error
-    sed -i "s|--colors||g" package.json
+    mv ${_pkgname}-${pkgver} ${_pkgname}
+#    _ensure_local_nvm
+#    nvm install 14
 }
 
 build() {
-    cd $srcdir/${_pkgname}-${pkgver}
+    cd ${_pkgname}/
+#    _ensure_local_nvm
     export YARN_CACHE_FOLDER="${srcdir}/yarn_cache"
-    yarn install
-    install -Dm 644 package.json apps/package.json
-    
-    # start pack 
-    yarn run pack
-    cp -r dist apps
-    cd apps
-
-    # remove post install & install deps
-    sed -i "s|\"postinstall\".\+|\"postinstall\":\"\"|g" package.json
-    yarn install --production
-
-    # remove useless file
-    rm -rf node_modules/{.bin,.yarn-integrity}
-    rm -rf yarn.lock
-
-    # pack asar
-    cd ../
-    asar p apps app.asar
-    rm -rf apps/
+    yarn
+    yarn run build:dir
 }
 
 package() {
-    cd $srcdir/${_pkgname}-${pkgver}
-    install -Dm 644 app.asar ${pkgdir}/usr/lib/${pkgname}/app.asar
-    install -Dm 644 extra/linux/engine/aria2.conf ${pkgdir}/usr/lib/${pkgname}/engine/aria2.conf
 
-    # Copy aria2-fast from system. Motrix set 64 download threads as default, so if use original aria2c will get error.
-    install -Dm 775 /usr/bin/aria2c ${pkgdir}/usr/lib/${pkgname}/engine/aria2c
+    install -Dm 644 ${srcdir}/${_pkgname}/release/linux-unpacked/resources/app.asar ${pkgdir}/usr/lib/${pkgname}/app.asar
+    install -Dm 755 ${srcdir}/${_pkgname}/release/linux-unpacked/resources/engine/aria2c ${pkgdir}/usr/lib/${pkgname}/engine/aria2c
+    install -Dm 644 ${srcdir}/${_pkgname}/release/linux-unpacked/resources/engine/aria2.conf ${pkgdir}/usr/lib/${pkgname}/engine/aria2.conf
 
     # binary wrapper
     install -Dm 775 ${srcdir}/motrix ${pkgdir}/usr/bin/${pkgname}
@@ -78,5 +68,5 @@ package() {
     install -Dm 644 ${srcdir}/motrix.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
 
     # icons
-    install -Dm 644 build/256x256.png ${pkgdir}/usr/share/icons/${pkgname}.png
+    install -Dm 644 ${srcdir}/${_pkgname}/build/256x256.png ${pkgdir}/usr/share/icons/${pkgname}.png
 }