修改服务位置

3 files changed, 45 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cb5942c48d98..86c468768379 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,9 @@
 pkgbase = aria2-config-script
 	pkgdesc = 一个自动配置Aria2的脚本，自动创建、启动服务，可直接搭配浏览器插件使用。
 	pkgver = 0.2
-	pkgrel = 1
+	pkgrel = 2
 	arch = any
 	license = GPL
 	depends = aria2
-	source = aria2c.service
-	md5sums = 841c4eba255666216fd88c16080dd10b
 
 pkgname = aria2-config-script
-
diff --git a/PKGBUILD b/PKGBUILD
index d7bb2ef78da1..c1427b85c7d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,32 @@
 # Maintainer: xmengnet <794508986@qq.com>
 pkgname=aria2-config-script
 pkgver=0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="一个自动配置Aria2的脚本，自动创建、启动服务，可直接搭配浏览器插件使用。"
 arch=(any)
 license=('GPL')
 depends=('aria2')
 
-source=("aria2c.service")
-md5sums=(
-		  '841c4eba255666216fd88c16080dd10b')
 
 package() {
-usr=`whoami`
+user=`whoami`
 #开始安装
-
-file="aria2"
-file_session=/etc/aria2/aria2.session
-file_conf=aria2/aria2.conf
-userpath=/home/$usr/Downloads
+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 $file
-    echo "创建文件 $file_session"
-    touch $file_session
-    echo "创建文件 $file_conf"
-    touch $file_conf
-    chmod 777 $file_session
-    chmod 777 $file_conf
-    echo "写入默认配置信息..."
+     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
@@ -61,14 +59,31 @@ if [ ! -d "$file" ]; then
      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 里面的下载位置"
+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’ 设置开机自启并且现在启动"
+	
 }
diff --git a/aria2c.service b/aria2c.service
deleted file mode 100755
index f64cc0594281..000000000000
--- a/aria2c.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[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
-StandOutput=syslog
-
-StandError=inherit
-
-[Install]
-WantedBy=multi-user.target