修改bug

5 files changed, 78 insertions, 81 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 86c468768379..52cb72708b2e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,15 @@
 pkgbase = aria2-config-script
 	pkgdesc = 一个自动配置Aria2的脚本，自动创建、启动服务，可直接搭配浏览器插件使用。
-	pkgver = 0.2
-	pkgrel = 2
+	pkgver = 0.3
+	pkgrel = 1
 	arch = any
 	license = GPL
 	depends = aria2
+	source = aria2.conf
+	source = aria2.session
+	source = aria2c.service
+	md5sums = 3a0439d1a807938c789e4415c38a833b
+	md5sums = SKIP
+	md5sums = 4eb906a2e99a6920571d263f05433a73
 
 pkgname = aria2-config-script
diff --git a/PKGBUILD b/PKGBUILD
index c1427b85c7d6..6c43c094b482 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,89 +1,36 @@
 # Maintainer: xmengnet <794508986@qq.com>
 pkgname=aria2-config-script
-pkgver=0.2
-pkgrel=2
+pkgver=0.3
+pkgrel=1
 pkgdesc="一个自动配置Aria2的脚本，自动创建、启动服务，可直接搭配浏览器插件使用。"
 arch=(any)
 license=('GPL')
 depends=('aria2')
 
-
+source=("aria2.conf"
+	"aria2.session"
+	"aria2c.service")
+md5sums=('3a0439d1a807938c789e4415c38a833b'
+         'SKIP'
+         '4eb906a2e99a6920571d263f05433a73')
 package() {
-user=`whoami`
-#开始安装
-file=${pkgdir}/etc/aria2
-service_path=${pkgdir}/etc/systemd/system/
-service=$service_path/aria2.service
-file_session=$file/aria2.session
-file_conf=$file/aria2.conf
-userpath=/home/$user/Downloads
-if [ ! -d "$file" ]; then
-     echo "创建目录 $file"
-     mkdir -p $file
-     echo "创建文件 $file_session"
-     touch $file_session
-     echo "创建文件 $file_conf"
-     touch $file_conf
-     chmod 755 $file_session
-     chmod 755 $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
-if [ ! -d "$service" ]; then
-	echo "创建目录 $service_path"
-    	mkdir -p $service_path
-    	echo "创建服务 $service"
-    	touch $service
-	echo "[Unit]" >> $service
-	echo "Description=Aria2c Service" >> $service
-	echo "After=network-online.target" >> $service
-	echo "Wants=network-online.target" >> $service
-
-	echo "[Service]" >> $service
-	echo "Type=simple" >> $service
-	echo "ExecStart=/usr/bin/aria2c --conf-path=/etc/aria2/aria2.conf" >> $service
-	echo "ExecStop=/bin/killall aria2c" >> $service
-	echo "Restart=always" >> $service
-	echo "StandOutput=syslog" >> $service
-
-	echo "StandError=inherit" >> $service
-
-	echo "[Install]" >> $service
-	echo "WantedBy=multi-user.target"  >> $service
-fi
-	chmod 755 $service
-
-   	echo "请自行修改/etc/aria2/aria2.conf 里面的下载位置"
-	echo "然后使用 ‘sudo systemctl enable --now aria2c’ 设置开机自启并且现在启动"
+	
+	user="${HOME}"
+	file=${pkgdir}/etc/aria2/
+	service=${pkgdir}/etc/systemd/system/
+	sed -i "s#root#${user}#g" ${srcdir}/aria2.conf
+	#开始安装
+	if [ ! -d "$file" ]; then
+		mkdir -p $file
+	fi
+	if [ ! -d "$service" ]; then
+		mkdir -p $service
+	fi
+	install -Dm644 "${srcdir}"/aria2.conf "$file"
+	install -Dm644 "${srcdir}"/aria2.session "$file"
+	install -Dm644 "${srcdir}"/aria2c.service "$service"
+	
+   	echo "	********请自行修改/etc/aria2/aria2.conf 里面的下载位置"
+	echo "	********然后使用 ‘sudo systemctl enable --now aria2c’ 设置开机自启并且现在启动"
 	
 }
diff --git a/aria2.conf b/aria2.conf
new file mode 100755
index 000000000000..e424795d882f
--- /dev/null
+++ b/aria2.conf
@@ -0,0 +1,31 @@
+#＝＝＝＝＝＝＝＝＝文件保存目录自行修改
+#username根据实际情况修改
+dir=root/Downloads
+disable-ipv6=true
+
+#打开rpc的目的是为了给web管理端用
+enable-rpc=true
+rpc-allow-origin-all=true
+rpc-listen-all=true
+#rpc-listen-port=6800
+#断点续传
+continue=true
+input-file=/etc/aria2/aria2.session
+save-session=/etc/aria2/aria2.session
+
+#最大同时下载任务数
+max-concurrent-downloads=20
+save-session-interval=120
+
+# Http/FTP 相关
+connect-timeout=120
+#lowest-speed-limit=10K
+#同服务器连接数
+max-connection-per-server=10
+#max-file-not-found=2
+#最小文件分片大小, 下载线程数上限取决于能分出多少片, 对于小文件重要
+min-split-size=10M
+#单文件最大线程数, 路由建议值: 5
+split=10
+check-certificate=false
+#http-no-cache=true
diff --git a/aria2.session b/aria2.session
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/aria2.session
diff --git a/aria2c.service b/aria2c.service
new file mode 100755
index 000000000000..74d70c671275
--- /dev/null
+++ b/aria2c.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Aria2c Service
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/aria2c --conf-path=/etc/aria2/aria2.conf
+ExecStop=/bin/killall aria2c
+Restart=always
+
+[Install]
+WantedBy=multi-user.target