optimize pkgbuild script

3 files changed, 15 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 881d928d9cf0..05afc7891c23 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,18 +10,11 @@ pkgbase = clash-premium-tun
 	makedepends = gzip
 	depends = glibc
 	depends = clash-geoip
-	depends = iptables
 	depends = nftables
 	depends = systemd
 	depends = iproute2
 	provides = clash
-	provides = clash-dev
-	provides = clash-dev-git
-	provides = clash-premium-bin
 	conflicts = clash
-	conflicts = clash-dev
-	conflicts = clash-dev-git
-	conflicts = clash-premium-bin
 	backup = etc/clash/config.yaml
 	source = git+https://github.com/Kr328/clash-premium-installer.git#commit=e729951
 	source = https://github.com/Dreamacro/clash/releases/download/premium/clash-linux-amd64-2021.07.03.gz
diff --git a/PKGBUILD b/PKGBUILD
index f15611ae82b2..742e5d66b71d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,13 +9,13 @@ arch=('x86_64')
 url="https://github.com/Dreamacro/clash"
 license=('custom')
 install=${pkgname}.install
-depends=('glibc' 'clash-geoip' 'iptables' 'nftables' 'systemd' 'iproute2')
+depends=('glibc' 'clash-geoip' 'nftables' 'systemd' 'iproute2')
 makedepends=('git' 'gzip')
-provides=('clash' 'clash-dev' 'clash-dev-git' 'clash-premium-bin')
-conflicts=('clash' 'clash-dev' 'clash-dev-git' 'clash-premium-bin')
+provides=('clash')
+conflicts=('clash')
 backup=("etc/clash/config.yaml")
 source=("git+https://github.com/Kr328/clash-premium-installer.git#commit=e729951"
-        "https://github.com/Dreamacro/clash/releases/download/premium/clash-linux-amd64-2021.07.03.gz"
+        "https://github.com/Dreamacro/clash/releases/download/premium/clash-linux-amd64-${pkgver}.gz"
         "config.yaml")
 sha256sums=('SKIP'
             '2f6d81b350048c71fc142ea743ee4463663170638286e49d71e1c7b930c2d5b4'
@@ -26,6 +26,7 @@ prepare() {
 	sed -i "s/srv/etc/g" clash.service
 	sed -i "s/lib/share/g" clash.service
 	sed -i "s/bin\/bypass/share\/clash\/bypass/g" clash.service
+	sed -i "s/\ iptabels.service//g" clash.service
 	sed -i "s/lib/share/g" 99-clash.rules
 	sed -i "/bash/,+38 s/tcp, udp/tcp, udp, icmp/g" setup-tun.sh
 	sed -i "s/1.0.0.1/198.18.0.2/g" clash-default
@@ -34,9 +35,9 @@ prepare() {
 
 package() {
 	cd "${srcdir}"
-    gunzip --force clash-linux-amd64-2021.07.03.gz
-	install -Dm 755 clash-linux-amd64-2021.07.03 "${pkgdir}"/usr/bin/clash
-    install -Dm 644 ../config.yaml "${pkgdir}"/etc/clash/config.yaml
+    gunzip --force clash-linux-amd64-${pkgver}.gz
+	install -Dm 755 clash-linux-amd64-${pkgver} "${pkgdir}"/usr/bin/clash
+    install -Dm 644 config.yaml "${pkgdir}"/etc/clash/config.yaml
 	cd "${srcdir}"/clash-premium-installer/scripts
     install -Dm 644 clash-default "${pkgdir}"/etc/default/clash
     install -Dm 755 bypass-proxy-pid "${pkgdir}"/usr/share/clash/bypass-proxy-pid
diff --git a/clash-premium-tun.install b/clash-premium-tun.install
index 17d5a0a969f1..89092af1a39b 100644
--- a/clash-premium-tun.install
+++ b/clash-premium-tun.install
@@ -1,12 +1,7 @@
-pre_install() {
-	if [ -f /etc/clash/config.yaml ]; then
-		mv /etc/clash/config.yaml /etc/clash/config.yaml.bak
-	fi
-}
-
 post_install() {
-    echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-	echo "+  Install successfully                                         +"
+    systemctl daemon-reload
+	echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
+    echo "+  Install successfully                                         +"
     echo "+                                                               +"
     echo "+  Home directory at /etc/clash                                 +"
     echo "+                                                               +"
@@ -15,30 +10,17 @@ post_install() {
     echo "+                                                               +"
     echo "+  Use 'systemctl start clash' to start                         +"
     echo "+  Use 'systemctl enable clash' to enable auto-restart on boot  +"
-	echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-}
-
-pre_upgrade() {
-	if [ -f /etc/clash/config.yaml ]; then
-		mv /etc/clash/config.yaml /etc/clash/config.yaml.user
-	fi
+    echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
 }
 
 post_upgrade() {
-    if [ -f /etc/clash/config.yaml.user ]; then
-		mv /etc/clash/config.yaml.user /etc/clash/config.yaml
-	fi
-	systemctl restart clash
+    systemctl restart clash
 }
 
 pre_remove() {
-	systemctl stop clash
-    systemctl disable clash
-	if [ -f /etc/clash/config.yaml ]; then
-      mv /etc/clash/config.yaml /etc/clash/config.yaml.bak
-    fi
+    systemctl disable --now clash
 }
 
 post_remove() {
-	systemctl daemon-reload
+    systemctl daemon-reload
 }