renaming clash to clash-meta

5 files changed, 39 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f717c9be8a41..0036ac3111c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,18 @@
 pkgbase = clash-meta-bin
 	pkgdesc = Clash Meta binary provided by MetaCubeX
-	pkgver = v1.10.0
-	pkgrel = 1
+	pkgver = 1.10.0
+	pkgrel = 2
 	url = https://github.com/MetaCubeX/Clash.Meta
 	install = clash-meta-bin.install
 	arch = x86_64
 	license = unknown
 	depends = glibc
-	provides = clash
-	conflicts = clash
-	conflicts = clash-tun
-	conflicts = clash-dev-git
-	conflicts = clash-premium-bin
-	conflicts = clash-premium-tun
-	source = clash-meta-bin-x86_64v1-v1.10.0.gz::https://github.com/MetaCubeX/Clash.Meta/releases/download/v1.10.0/Clash.Meta-linux-amd64v1-v1.10.0.gz
-	source = clash.service
+	provides = clash-meta
+	source = clash-meta-bin-v1-1.10.0.gz::https://github.com/MetaCubeX/Clash.Meta/releases/download/v1.10.0/Clash.Meta-linux-amd64v1-v1.10.0.gz
+	source = clash-meta.service
 	source = config.yaml
 	sha256sums = 722391375a5c66d650cdb0012e0fea69b8a3706a03198329af089fde1088d812
-	sha256sums = e68448a05f9641bacee58ff40cca4eb1523f5c840550eb01b7c2904d4bbe6603
+	sha256sums = 83377618a3b381348f274f48bc40e2ba8b17a4f17dc8e9f5b16d76404c34ae8d
 	sha256sums = 8fe0a2163ef5a1ac6ab0692921816187350d05d5f1cc4613080d7facb36eedc8
 
 pkgname = clash-meta-bin
diff --git a/.gitignore b/.gitignore
index c355b8ddb261..475c2e94dfac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,6 @@
 !.gitignore
 !PKGBUILD
 !.SRCINFO
-!clash@.service
-!clash.service
-!clash_user.service
+!clash-meta.service
 !clash-meta-bin.install
 !config.yaml
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 89a725f98a95..c18c714bc630 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,44 @@
 ## Maintainer: adiprasetya <ignilium.inc@gmail.com>
 
+
+
+
+license=("unknown")
+depends=()
+
+
+
+
+
 pkgname=clash-meta-bin
-pkgver=v1.10.0
-pkgrel=1
+pkgver=1.10.0
+pkgrel=2
 pkgdesc="Clash Meta binary provided by MetaCubeX"
-provides=("clash")
-conflicts=("clash" "clash-tun" "clash-dev-git" "clash-premium-bin" "clash-premium-tun")
 arch=("x86_64")
 url="https://github.com/MetaCubeX/Clash.Meta"
 license=("unknown")
+groups=()
 depends=("glibc")
+makedepends=()
+checkdepends=()
+optdepends=()
+provides=("clash-meta")
+conflicts=()
+replaces=()
+backup=()
+options=()
 install=${pkgname}.install
-source=("${pkgname}-x86_64v1-${pkgver}.gz::${url}/releases/download/${pkgver}/Clash.Meta-linux-amd64v1-${pkgver}.gz"
-        "clash.service"
+changelog=
+source=("${pkgname}-v1-${pkgver}.gz::${url}/releases/download/v${pkgver}/Clash.Meta-linux-amd64v1-v${pkgver}.gz"
+        "clash-meta.service"
         "config.yaml")
-sha256sums=('722391375a5c66d650cdb0012e0fea69b8a3706a03198329af089fde1088d812'
-            'e68448a05f9641bacee58ff40cca4eb1523f5c840550eb01b7c2904d4bbe6603'
+sha256sums=('3fcce7982c32bab135334e9a53cb0ec9e53f1766af626b0c2c50023c815969e4'
+            '83377618a3b381348f274f48bc40e2ba8b17a4f17dc8e9f5b16d76404c34ae8d'
             '8fe0a2163ef5a1ac6ab0692921816187350d05d5f1cc4613080d7facb36eedc8')
 
 package() {
     cd ${srcdir}
-    install -Dm755 "${pkgname}-${CARCH}v1-${pkgver}" "${pkgdir}/usr/bin/clash"
-    install -Dm 644 config.yaml "${pkgdir}"/etc/clash/config.yaml
-    install -Dm644 "clash.service" "${pkgdir}/usr/lib/systemd/system/clash.service"
+    install -Dm755 "${pkgname}-v1-${pkgver}" "${pkgdir}/usr/bin/clash-meta"
+    install -Dm644 config.yaml "${pkgdir}"/etc/clash-meta/config.yaml
+    install -Dm644 "clash-meta.service" "${pkgdir}/usr/lib/systemd/system/clash-meta.service"
 }
diff --git a/clash-meta-bin.install b/clash-meta-bin.install
index 00bcc303c01d..2bcdf3bff98c 100644
--- a/clash-meta-bin.install
+++ b/clash-meta-bin.install
@@ -5,7 +5,8 @@ post_upgrade(){
     cat << EOF
     This is the core of Clash Meta by MetaCubeX forked from Clash by Dreamacro.
     You can find the manual at https://github.com/Dreamacro/clash/wiki/configuration
-    Home directory clash.service at /etc/clash
+    Home directory clash-meta.service at /etc/clash-meta
+    User home directory ~/.config/clash by default
 EOF
 
 }
\ No newline at end of file
diff --git a/clash.service b/clash-meta.service
index 237c45d27b0b..dbb5d05c49d9 100644
--- a/clash.service
+++ b/clash-meta.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=exec
 Restart=on-abort
-ExecStart=/usr/bin/clash -d /etc/clash
+ExecStart=/usr/bin/clash-meta -d /etc/clash-meta
 
 [Install]
 WantedBy=default.target