aria2-config-script

4 files changed, 68 insertions, 85 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 037849e02d7d..cb5942c48d98 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,12 @@
 pkgbase = aria2-config-script
 	pkgdesc = 一个自动配置Aria2的脚本，自动创建、启动服务，可直接搭配浏览器插件使用。
-	pkgver = 0.1
+	pkgver = 0.2
 	pkgrel = 1
 	arch = any
 	license = GPL
 	depends = aria2
-	depends = sudo
-	source = https://pan.xmengnet.cn/Aliyun/aur/aria2-config-script/0.1/aria2-install.sh
-	source = https://pan.xmengnet.cn/Aliyun/aur/aria2-config-script/0.1/aria2c.service
-	md5sums = 0f49112b1bb2821895166012486b91d9
-	md5sums = 3e72d1034ab27b3452f551dbd0f46da0
+	source = aria2c.service
+	md5sums = 841c4eba255666216fd88c16080dd10b
 
 pkgname = aria2-config-script
 
diff --git a/PKGBUILD b/PKGBUILD
index 405fc9e1dd6c..d7bb2ef78da1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,74 @@
 # Maintainer: xmengnet <794508986@qq.com>
 pkgname=aria2-config-script
-pkgver=0.1
+pkgver=0.2
 pkgrel=1
 pkgdesc="一个自动配置Aria2的脚本，自动创建、启动服务，可直接搭配浏览器插件使用。"
 arch=(any)
 license=('GPL')
-depends=('aria2'
-		  'sudo')
-
-source=("https://pan.xmengnet.cn/Aliyun/aur/aria2-config-script/$pkgver/aria2-install.sh"
-        "https://pan.xmengnet.cn/Aliyun/aur/aria2-config-script/$pkgver/aria2c.service")
-md5sums=('0f49112b1bb2821895166012486b91d9'
-		  '3e72d1034ab27b3452f551dbd0f46da0')
-validpgpkeys=()
+depends=('aria2')
 
+source=("aria2c.service")
+md5sums=(
+		  '841c4eba255666216fd88c16080dd10b')
 
 package() {
-	chmod +x ./aria2-install.sh
-	sh ./aria2-install.sh
+usr=`whoami`
+#开始安装
+
+file="aria2"
+file_session=/etc/aria2/aria2.session
+file_conf=aria2/aria2.conf
+userpath=/home/$usr/Downloads
+if [ ! -d "$file" ]; then
+    echo "创建目录 $file"
+    mkdir $file
+    echo "创建文件 $file_session"
+    touch $file_session
+    echo "创建文件 $file_conf"
+    touch $file_conf
+    chmod 777 $file_session
+    chmod 777 $file_conf
+    echo "写入默认配置信息..."
+     echo "#＝＝＝＝＝＝＝＝＝文件保存目录自行修改">> $file_conf
+     echo "#username根据实际情况修改">> $file_conf
+     echo "dir=$userpath">> $file_conf
+     echo "disable-ipv6=true">> $file_conf
+     echo "">> $file_conf
+     echo "#打开rpc的目的是为了给web管理端用">> $file_conf
+     echo "enable-rpc=true">> $file_conf
+     echo "rpc-allow-origin-all=true">> $file_conf
+     echo "rpc-listen-all=true">> $file_conf
+     echo "#rpc-listen-port=6800">> $file_conf
+     echo "#断点续传">> $file_conf
+     echo "continue=true">> $file_conf
+     echo "input-file=$file_session">> $file_conf
+     echo "save-session=$file_session">> $file_conf
+     echo "">> $file_conf
+     echo "#最大同时下载任务数">> $file_conf
+     echo "max-concurrent-downloads=20">> $file_conf
+     echo "save-session-interval=120">> $file_conf
+     echo "">> $file_conf
+     echo "# Http/FTP 相关">> $file_conf
+     echo "connect-timeout=120">> $file_conf
+     echo "#lowest-speed-limit=10K">> $file_conf
+     echo "#同服务器连接数">> $file_conf
+     echo "max-connection-per-server=10">> $file_conf
+     echo "#max-file-not-found=2">> $file_conf
+     echo "#最小文件分片大小, 下载线程数上限取决于能分出多少片, 对于小文件重要">> $file_conf
+     echo "min-split-size=10M">> $file_conf
+     echo "#单文件最大线程数, 路由建议值: 5">> $file_conf
+     echo "split=10">> $file_conf
+     echo "check-certificate=false">> $file_conf
+     echo "#http-no-cache=true">> $file_conf
+fi
+	mkdir -p ${pkgdir}/usr/lib/systemd/user/
+	chmod 755 aria2c.service
+	mv aria2c.service ${pkgdir}/usr/lib/systemd/user/
+    chmod 755 aria2
+    mkdir -p ${pkgdir}/etc/aria2
+    mv aria2 ${pkgdir}/etc/
+	echo "使用 ‘systemctl --user daemon-reload’ 重载systemctl 配置"
+	echo "使用 ‘systemctl --user enable aria2c’ 设置开机自启"
+	echo "使用 ‘systemctl --user aria2c start’ 启动服务"
+	echo "上面的命令行都不需要sudo 请自行修改/etc/aria2/aria2.conf 里面的下载位置"
 }
diff --git a/aria2-install.sh b/aria2-install.sh
deleted file mode 100755
index 78ed6d5c3a5d..000000000000
--- a/aria2-install.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-#开始安装 aria2
-usr=`whoami`
-file="/etc/aria2"
-file_session=/etc/aria2/aria2.session
-file_conf=/etc/aria2/aria2.conf
-userpath=/home/$usr/Downloads
-if [ ! -d "$file" ]; then
-    echo "正在安装 aria2 "
-    sudo pacman -S --noconfirm aria2
-    echo "创建目录 $file"
-    sudo mkdir $file
-    echo "创建文件 $file_session"
-    sudo touch $file_session
-    echo "创建文件 $file_conf"
-    sudo touch $file_conf
-    sudo chmod 777 $file_session
-    sudo chmod 777 $file_conf
-    echo "写入默认配置信息..."
-    sudo echo "#＝＝＝＝＝＝＝＝＝文件保存目录自行修改">> $file_conf
-    sudo echo "#username根据实际情况修改">> $file_conf
-    sudo echo "dir=$userpath">> $file_conf
-    sudo echo "disable-ipv6=true">> $file_conf
-    sudo echo "">> $file_conf
-    sudo echo "#打开rpc的目的是为了给web管理端用">> $file_conf
-    sudo echo "enable-rpc=true">> $file_conf
-    sudo echo "rpc-allow-origin-all=true">> $file_conf
-    sudo echo "rpc-listen-all=true">> $file_conf
-    sudo echo "#rpc-listen-port=6800">> $file_conf
-    sudo echo "#断点续传">> $file_conf
-    sudo echo "continue=true">> $file_conf
-    sudo echo "input-file=$file_session">> $file_conf
-    sudo echo "save-session=$file_session">> $file_conf
-    sudo echo "">> $file_conf
-    sudo echo "#最大同时下载任务数">> $file_conf
-    sudo echo "max-concurrent-downloads=20">> $file_conf
-    sudo echo "save-session-interval=120">> $file_conf
-    sudo echo "">> $file_conf
-    sudo echo "# Http/FTP 相关">> $file_conf
-    sudo echo "connect-timeout=120">> $file_conf
-    sudo echo "#lowest-speed-limit=10K">> $file_conf
-    sudo echo "#同服务器连接数">> $file_conf
-    sudo echo "max-connection-per-server=10">> $file_conf
-    sudo echo "#max-file-not-found=2">> $file_conf
-    sudo echo "#最小文件分片大小, 下载线程数上限取决于能分出多少片, 对于小文件重要">> $file_conf
-    sudo echo "min-split-size=10M">> $file_conf
-    sudo echo "#单文件最大线程数, 路由建议值: 5">> $file_conf
-    sudo echo "split=10">> $file_conf
-    sudo echo "check-certificate=false">> $file_conf
-    sudo echo "#http-no-cache=true">> $file_conf
-fi
-
-#开始安装服务
-aria2ser=/etc/systemd/system//aria2c.service
-if [ ! -d "$aria2ser" ]; then
-    echo "开始安装 aria2c 服务"
-    sudo cp aria2c.service $aria2ser
-    sudo chmod 755 $aria2ser
-    echo "重载 systemctl 配置"
-    sudo systemctl daemon-reload
-    echo "设置开机启动项"
-    sudo systemctl enable aria2c
-    echo "安装完成"
-    sudo systemctl aria2c stop
-    sudo systemctl aria2c start
-    echo "重启服务成功"
-fi
diff --git a/aria2c.service b/aria2c.service
index a8bbfba32901..f64cc0594281 100755
--- a/aria2c.service
+++ b/aria2c.service
@@ -5,7 +5,7 @@ Wants=network-online.target
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/aria2c --conf-path=/etc/aria2/aria2.conf 
+ExecStart=/usr/bin/aria2c --conf-path=/etc/aria2/aria2.conf
 ExecStop=/bin/killall aria2c
 Restart=always
 StandOutput=syslog