summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO35
-rw-r--r--.gitignore4
-rw-r--r--PKGBUILD105
-rwxr-xr-xaria2.conf113
-rw-r--r--[-rwxr-xr-x]motrix8
-rw-r--r--motrix.desktop (renamed from Motrix.desktop)4
6 files changed, 67 insertions, 202 deletions
diff --git a/.SRCINFO b/.SRCINFO
index af58fe62bd39..53d8114f1e97 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,34 +1,23 @@
pkgbase = motrix
- pkgdesc = elegent downloading tool frontend for aria2c,using vue(release version)
- pkgver = v1.3.8
- pkgrel = 2
+ pkgdesc = A full-featured download manager (release version)
+ pkgver = 1.8.19
+ pkgrel = 3
url = https://github.com/agalwood/Motrix
arch = x86_64
license = MIT
- makedepends = curl
- makedepends = yarn
makedepends = npm
- depends = bash
- depends = tar
- depends = fakeroot
- depends = glibc
- depends = glib2
- depends = nss
- depends = nspr
+ makedepends = yarn
+ makedepends = nodejs
+ makedepends = python
depends = gtk3
- depends = pango
- depends = atk
- depends = nettle
depends = libxcb
+ depends = electron22
conflicts = motrix-git
- source = Motrix.desktop
- source = aria2.conf
+ source = motrix.desktop
source = motrix
- source = Motrix.tar.gz::https://github.com/agalwood/Motrix/archive/v1.3.8.tar.gz
- sha256sums = 1b799d1b1e280a27ff625cceb429b1e00c6691eb0256ded44f6a1a0310a899d4
- sha256sums = 1dc0dd1949e086aabf393a4f53fd290dce7bebdcfa958919f8673bdce9c9b57d
- sha256sums = ec66063afe506835730f6ba4be55d4aa150b9b587a4d0246c307433fcae1a49d
- sha256sums = 340863d23dd6ce4eebcbbb9bb396ad497e2eab1bb7bf7d1b33ef501002154e93
+ 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 7cafbd9af9ca..c36621b33d25 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +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.3.8
-_pkgver=1.3.8
-pkgrel=2
+pkgver=1.8.19
+pkgrel=3
epoch=
-pkgdesc="elegent downloading tool frontend for aria2c,using vue(release version)"
+pkgdesc="A full-featured download manager (release version)"
arch=("x86_64")
url="https://github.com/agalwood/Motrix"
license=('MIT')
groups=()
-depends=('bash'
- 'tar'
- 'fakeroot'
- 'glibc'
- 'glib2'
- 'nss'
- 'nspr'
- 'gtk3'
- 'pango'
- 'atk'
- 'nettle'
- 'libxcb'
- )
-makedepends=('curl'
- 'yarn'
- 'npm')
+depends=('gtk3' 'libxcb' 'electron22')
+makedepends=('npm' 'yarn' 'nodejs' 'python')
checkdepends=()
optdepends=()
provides=()
@@ -35,49 +22,51 @@ backup=()
options=()
install=
changelog=
-source=("Motrix.desktop"
- "aria2.conf"
- "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'
- '1dc0dd1949e086aabf393a4f53fd290dce7bebdcfa958919f8673bdce9c9b57d'
- 'ec66063afe506835730f6ba4be55d4aa150b9b587a4d0246c307433fcae1a49d'
- '340863d23dd6ce4eebcbbb9bb396ad497e2eab1bb7bf7d1b33ef501002154e93')
+sha256sums=('c5f185162cdb83c387399e314be355585837a9efcd8ac35425656e4d24f7a5b3'
+ 'bb1432adbac2120ef5c59d718f1cd48ef5fc920d3d1231ba32390c700465f3a5'
+ 'd2a48692549d426e9dfa0fad9897dddf200b7b82198d59e64819d419114a10d8')
validpgpkeys=()
-prepare() {
- tar -xvf $_pkgname.tar.gz
- rm $_pkgname.tar.gz
- mv $_pkgname-$_pkgver $_pkgname
-# 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'
- 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/
- yarn
- yarn run build
+ 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
- install -Dm 644 ${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/aria2.conf b/aria2.conf
deleted file mode 100755
index 08f7c4485ed6..000000000000
--- a/aria2.conf
+++ /dev/null
@@ -1,113 +0,0 @@
-dir=~/Download
-# 启用磁盘缓存, 0为禁用缓存, 需1.16以上版本, 默认:16M
-disk-cache=32M
-# 文件预分配方式, 能有效降低磁盘碎片, 默认:prealloc
-# 预分配所需时间: none < falloc ? trunc < prealloc
-# falloc和trunc则需要文件系统和内核支持
-# NTFS建议使用falloc, EXT3/4建议trunc, MAC 下需要注释此项
-file-allocation=none
-# 断点续传
-continue=true
-
-## 下载连接相关 ##
-
-# 最大同时下载任务数, 运行时可修改, 默认:5
-#max-concurrent-downloads=5
-# 同一服务器连接数, 添加时可指定, 默认:1
-#max-connection-per-server=5
-# 最小文件分片大小, 添加时可指定, 取值范围1M -1024M, 默认:20M
-# 假定size=10M, 文件为20MiB 则使用两个来源下载; 文件为15MiB 则使用一个来源下载
-min-split-size=10M
-# 单个任务最大线程数, 添加时可指定, 默认:5
-split=5
-# 整体下载速度限制, 运行时可修改, 默认:0
-#max-overall-download-limit=0
-# 单个任务下载速度限制, 默认:0
-#max-download-limit=0
-# 整体上传速度限制, 运行时可修改, 默认:0
-#max-overall-upload-limit=0
-# 单个任务上传速度限制, 默认:0
-#max-upload-limit=0
-# 禁用IPv6, 默认:false
-disable-ipv6=true
-# 连接超时时间, 默认:60
-timeout=60
-# 最大重试次数, 设置为0表示不限制重试次数, 默认:5
-max-tries=3
-# 设置重试等待的秒数, 默认:0
-retry-wait=0
-
-## 进度保存相关 ##
-
-# 从会话文件中读取下载任务
-input-file=/var/cache/aria2.session
-# 在Aria2退出时保存`错误/未完成`的下载任务到会话文件
-save-session=/var/cache/aria2.session
-# 定时保存会话, 0为退出时才保存, 需1.16.1以上版本, 默认:0
-save-session-interval=0
-
-## RPC相关设置 ##
-
-# 启用RPC, 默认:false
-enable-rpc=true
-# 允许所有来源, 默认:false
-rpc-allow-origin-all=
-# 允许非外部访问, 默认:false
-rpc-listen-all=true
-# 事件轮询方式, 取值:[epoll, kqueue, port, poll, select], 不同系统默认值不同
-#event-poll=select
-# RPC监听端口, 端口被占用时可以修改, 默认:6800
-#rpc-listen-port=6800
-# 设置的RPC授权令牌, v1.18.4新增功能, 取代 --rpc-user 和 --rpc-passwd 选项
-#rpc-secret=<TOKEN>
-# 设置的RPC访问用户名, 此选项新版已废弃, 建议改用 --rpc-secret 选项
-#rpc-user=<USER>
-# 设置的RPC访问密码, 此选项新版已废弃, 建议改用 --rpc-secret 选项
-#rpc-passwd=<PASSWD>
-# 是否启用 RPC 服务的 SSL/TLS 加密,
-# 启用加密后 RPC 服务需要使用 https 或者 wss 协议连接
-#rpc-secure=true
-# 在 RPC 服务中启用 SSL/TLS 加密时的证书文件,
-# 使用 PEM 格式时,您必须通过 --rpc-private-key 指定私钥
-#rpc-certificate=/path/to/certificate.pem
-# 在 RPC 服务中启用 SSL/TLS 加密时的私钥文件
-#rpc-private-key=/path/to/certificate.key
-
-## BT/PT下载相关 ##
-
-# 当下载的是一个种子(以.torrent结尾)时, 自动开始BT任务, 默认:true
-follow-torrent=true
-# BT监听端口, 当端口被屏蔽时使用, 默认:6881-6999
-listen-port=51413
-# 单个种子最大连接数, 默认:55
-#bt-max-peers=55
-# 打开DHT功能, PT需要禁用, 默认:true
-enable-dht=false
-# 打开IPv6 DHT功能, PT需要禁用
-#enable-dht6=false
-# DHT网络监听端口, 默认:6881-6999
-dht-listen-port=6881-6999
-# 本地节点查找, PT需要禁用, 默认:false
-#bt-enable-lpd=false
-# 种子交换, PT需要禁用, 默认:true
-enable-peer-exchange=false
-# 每个种子限速, 对少种的PT很有用, 默认:50K
-bt-request-peer-speed-limit=50K
-# 客户端伪装, PT需要
-peer-id-prefix=-TR2770-
-user-agent=Transmission/2.77
-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:56.0) Gecko/20100101 Firefox/56.0
-# 当种子的分享率达到这个数时, 自动停止做种, 0为一直做种, 默认:1.0
-seed-ratio=0
-# 强制保存会话, 即使任务已经完成, 默认:false
-# 较新的版本开启后会在任务完成后依然保留.aria2文件
-force-save=true
-# BT校验相关, 默认:true
-#bt-hash-check-seed=true
-# 继续之前的BT任务时, 无需再次校验, 默认:false
-bt-seed-unverified=true
-# 保存磁力链接元数据为种子文件(.torrent文件), 默认:false
-bt-save-metadata=true
-# bt-tracker数据来自https://github.com/ngosang/trackerslist/blob/master/trackers_best.txt
-
-bt-tracker=udp://tracker.coppersurfer.tk:6969/announce,udp://tracker.opentrackr.org:1337/announce,udp://tracker.internetwarriors.net:1337/announce,udp://9.rarbg.to:2710/announce,udp://exodus.desync.com:6969/announce,udp://tracker2.itzmx.com:6961/announce,udp://tracker1.itzmx.com:8080/announce,udp://explodie.org:6969/announce,http://tracker.tfile.me:80/announce.php,http://tracker.tfile.me:80/announce,http://tracker.tfile.co:80/announce,http://peersteers.org:80/announce,udp://tracker.tiny-vps.com:6969/announce,udp://ipv4.tracker.harry.lu:80/announce,udp://denis.stalker.upeer.me:6969/announce,udp://tracker.torrent.eu.org:451/announce,udp://tracker.port443.xyz:6969/announce,udp://tracker.cyberia.is:6969/announce,udp://thetracker.org:80/announce,udp://retracker.lanta-net.ru:2710/announce
diff --git a/motrix b/motrix
index 79d467bbd06b..748ee76cbbd4 100755..100644
--- a/motrix
+++ b/motrix
@@ -1,7 +1,3 @@
#!/bin/bash
-if [[ ! -f "/var/cache/aria2.session" ]]
-then
- touch /var/cache/aria2.session;
- chmod 666 /var/cache/aria2.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