summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO20
-rw-r--r--.gitignore4
-rw-r--r--PKGBUILD111
-rw-r--r--[-rwxr-xr-x]motrix9
-rw-r--r--motrix.desktop (renamed from Motrix.desktop)4
5 files changed, 65 insertions, 83 deletions
diff --git a/.SRCINFO b/.SRCINFO
index aa4dd6185da1..53d8114f1e97 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,23 @@
pkgbase = motrix
pkgdesc = A full-featured download manager (release version)
- pkgver = v1.5.15
- pkgrel = 0
+ pkgver = 1.8.19
+ pkgrel = 3
url = https://github.com/agalwood/Motrix
arch = x86_64
license = MIT
- makedepends = curl
makedepends = npm
+ makedepends = yarn
+ makedepends = nodejs
+ makedepends = python
depends = gtk3
depends = libxcb
+ depends = electron22
conflicts = motrix-git
- source = Motrix.desktop
+ source = motrix.desktop
source = motrix
- source = Motrix.tar.gz::https://github.com/agalwood/Motrix/archive/v1.5.15.tar.gz
- sha256sums = 1b799d1b1e280a27ff625cceb429b1e00c6691eb0256ded44f6a1a0310a899d4
- sha256sums = c89824e80769b0b19c66da12168f9e91fc15088d1324d6760ddad960eb006cba
- sha256sums = 73059db1fd7d9d145155f2ce0aa33a07b356ce042f214b8c0357b985e334289d
+ source = https://github.com/agalwood/Motrix/archive/v1.8.19.tar.gz
+ sha256sums = c5f185162cdb83c387399e314be355585837a9efcd8ac35425656e4d24f7a5b3
+ sha256sums = bb1432adbac2120ef5c59d718f1cd48ef5fc920d3d1231ba32390c700465f3a5
+ sha256sums = d2a48692549d426e9dfa0fad9897dddf200b7b82198d59e64819d419114a10d8
pkgname = motrix
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..b16beccdf622
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.tar.gz
+*.pkg.tar.zst
+src
+pkg
diff --git a/PKGBUILD b/PKGBUILD
index fe9f8094aaa6..c36621b33d25 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,18 @@
-#Maintainer: weearc <q19981121@163.com>
+# Maintainer: zhullyb <zhullyb [at] outlook dot com>
+# Contributor: weearc <q19981121 [at] 163 dot com>
+# Contributor: JimMoen <LnJimMoen [at] outlook dot com>
pkgname=motrix
_pkgname=Motrix
-pkgver=v1.5.15
-_pkgver=1.5.15
-pkgrel=0
+pkgver=1.8.19
+pkgrel=3
epoch=
pkgdesc="A full-featured download manager (release version)"
arch=("x86_64")
url="https://github.com/agalwood/Motrix"
license=('MIT')
groups=()
-depends=(
- 'gtk3'
- 'libxcb'
- )
-makedepends=('curl'
- 'npm'
- )
+depends=('gtk3' 'libxcb' 'electron22')
+makedepends=('npm' 'yarn' 'nodejs' 'python')
checkdepends=()
optdepends=()
provides=()
@@ -26,66 +22,51 @@ backup=()
options=()
install=
changelog=
-source=("Motrix.desktop"
- "motrix"
- "Motrix.tar.gz"::"https://github.com/agalwood/Motrix/archive/v$_pkgver.tar.gz")
+source=("motrix.desktop"
+ "motrix"
+ "https://github.com/agalwood/Motrix/archive/v${pkgver}.tar.gz")
noextract=()
-sha256sums=('1b799d1b1e280a27ff625cceb429b1e00c6691eb0256ded44f6a1a0310a899d4'
- 'c89824e80769b0b19c66da12168f9e91fc15088d1324d6760ddad960eb006cba'
- '73059db1fd7d9d145155f2ce0aa33a07b356ce042f214b8c0357b985e334289d')
+sha256sums=('c5f185162cdb83c387399e314be355585837a9efcd8ac35425656e4d24f7a5b3'
+ 'bb1432adbac2120ef5c59d718f1cd48ef5fc920d3d1231ba32390c700465f3a5'
+ 'd2a48692549d426e9dfa0fad9897dddf200b7b82198d59e64819d419114a10d8')
validpgpkeys=()
-prepare() {
- tar -xvf $_pkgname.tar.gz
- rm $_pkgname.tar.gz
- mv $_pkgname-$_pkgver $_pkgname
- npm config set ELECTRON_BUILDER_BINARIES_MIRROR=https://pan.yasking.org/electron-builder/
-# echo "====================================="
-# echo "Finding if you are in China..."
-# curl https://myip.ipip.net | grep -i "中国"
-# if [ $? -eq 0 ]
-# then
-# echo "Yes,I'm sure you are in China."
-# echo "To speed up installation I'll change npm mirrors to Taobao."
-# npm config set registry 'https://registry.npm.taobao.org'
-# export ELECTRON_MIRROR='https://npm.taobao.org/mirrors/electron/'
-# export SASS_BINARY_SITE='https://npm.taobao.org/mirrors/node-sass'
-# else
-# curl https://myip.ipip.net | grep -i "China"
-# if [ $? -eq 0 ]
-# then
-# echo "Yes,I'm sure you are in China."
-# echo "To speed up installation I'll change npm mirrors to Taobao."
-# npm config set registry 'https://registry.npm.taobao.org'
-# export ELECTRON_MIRROR='https://npm.taobao.org/mirrors/electron/'
-# export SASS_BINARY_SITE='https://npm.taobao.org/mirrors/node-sass'
-# fi
-# fi
-# echo "======================================"
-# sed -i '/"dmg"/,/"linux"/{//!d}' $_pkgname/package.json
-# sed -i '/"dmg"/d' $_pkgname/package.json
-# sed -i '/"deb"/d' $_pkgname/package.json
-# sed -i '/"snap"/d' $_pkgname/package.json
-# sed -i '/"pacman"/d' $_pkgname/package.json
-# sed -i '/"rpm"/d' $_pkgname/package.json
-# sed -i 's/"AppImage"/"dir"/g' $_pkgname/package.json
+#_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() {
+# _ensure_local_nvm
+# nvm install 14
+#}
build() {
- cd $_pkgname/
- npm install && npm run build:dir
+ cd ${srcdir}/${_pkgname}-${pkgver}
+# _ensure_local_nvm
+ export YARN_CACHE_FOLDER="${srcdir}/yarn_cache"
+ yarn
+ yarn run build:dir
}
+
package() {
- install -d ${pkgdir}/opt
- install -d ${pkgdir}/usr/bin
- install -d ${pkgdir}/usr/share/icons
- install -d ${pkgdir}/usr/share/applications
- mv ${srcdir}/$_pkgname/release/linux-unpacked/ ${pkgdir}/opt/motrix
- install -Dm644 ${srcdir}/$_pkgname/build/256x256.png ${pkgdir}/usr/share/icons/$pkgname.png
- install -Dm 777 ${srcdir}/motrix ${pkgdir}/usr/bin
- install -Dm 644 ${srcdir}/Motrix.desktop ${pkgdir}/usr/share/applications
-# rm ${pkgdir}/opt/motrix/resources/engine/aria2.conf
-# cp -p ${srcdir}/aria2.conf ${pkgdir}/opt/motrix/resources/engine/aria2.conf
- rm -rf ${srcdir}
+
+ install -Dm 644 ${srcdir}/${_pkgname}-${pkgver}/release/linux-unpacked/resources/app.asar ${pkgdir}/usr/lib/${pkgname}/app.asar
+ install -Dm 755 ${srcdir}/${_pkgname}-${pkgver}/release/linux-unpacked/resources/engine/aria2c ${pkgdir}/usr/lib/${pkgname}/engine/aria2c
+ install -Dm 644 ${srcdir}/${_pkgname}-${pkgver}/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}
+
+ # desktop enrty
+ install -Dm 644 ${srcdir}/motrix.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
+
+ # icons
+ install -Dm 644 ${srcdir}/${_pkgname}-${pkgver}/build/256x256.png ${pkgdir}/usr/share/icons/${pkgname}.png
}
diff --git a/motrix b/motrix
index 5e8f5f9e48b6..748ee76cbbd4 100755..100644
--- a/motrix
+++ b/motrix
@@ -1,8 +1,3 @@
#!/bin/bash
-SESSION="$HOME/.cache/aria2.session"
-if [[ ! -f $SESSION ]]
-then
- touch $SESSION;
- chmod 666 $SESSION;
-fi
-exec /opt/motrix/motrix
+export ELECTRON_IS_DEV=0
+exec /usr/bin/electron22 /usr/lib/motrix/app.asar "$@"
diff --git a/Motrix.desktop b/motrix.desktop
index 03dc1cb45e4b..26d9080212dc 100644
--- a/Motrix.desktop
+++ b/motrix.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
Name=Motrix
-Comment=download manager
+Comment=A full-featured download manager.
Keywords=
-Exec=/usr/bin/motrix
+Exec=motrix &U
TryExec=
Terminal=false
Icon=/usr/share/icons/motrix.png