update to 0.19.27

5 files changed, 45 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0f7696baff15..083434c888ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = clash-for-windows-electron-bin
 	pkgdesc = A Windows/macOS/Linux GUI based on Clash and Electron. Using system clash and electron
-	pkgver = 0.19.26
+	pkgver = 0.19.27
 	pkgrel = 1
 	url = https://github.com/Fndroid/clash_for_windows_pkg
 	install = clash-for-windows-bin.install
 	arch = x86_64
+	arch = aarch64
 	license = unknown
 	makedepends = asar
 	makedepends = npm
@@ -18,13 +19,17 @@ pkgbase = clash-for-windows-electron-bin
 	provides = clash-for-windows-electron
 	conflicts = clash-for-windows
 	conflicts = clash-for-windows-bin
-	source = clash-for-windows-electron-bin-0.19.26-x86_64-linux.tar.gz::https://github.com/Fndroid/clash_for_windows_pkg/releases/download/0.19.26/Clash.for.Windows-0.19.26-x64-linux.tar.gz
 	source = clash-for-windows.desktop
 	source = cfw
+	source = cfw-start-pre.sh
 	source = clash-core-service@.service
-	sha256sums = ba02c4cb961ff26809fd5b3bc9da333f9164029c2bc92a771fa5f2b9672369d6
-	sha256sums = 340ee7a8c8e7da27eca9891dbc6997e7b2d87607947e8010903fb79d1fbb9da6
+	sha256sums = 9a84b05b718913d3d1fbe462a2da671abff2cb94bb2ded75a3af12204cebe32f
 	sha256sums = db2e160e5d5cf82ed69d0926ac51c0eccb9efc541f89be3bb467d85be509f735
-	sha256sums = c199f6b11d32d9ef70316420cc9b6b78c0491d1c687a85ae570d76113d72d761
+	sha256sums = 2d1cb05f33eef51d01bca397ac52796a557b812b243f0d5e5377f7640e4d4433
+	sha256sums = 54d4d262356044fb75ce7bdee662aa44046842f9c70765cd6dd0185415388409
+	source_x86_64 = clash-for-windows-electron-bin-0.19.27-x86_64-linux.tar.gz::https://github.com/Fndroid/clash_for_windows_pkg/releases/download/0.19.27/Clash.for.Windows-0.19.27-amd64-linux.tar.gz
+	sha256sums_x86_64 = 5691f43c07e1a07e773f713062f255a472d6e6bfbae4a8ff278b125d2999bd98
+	source_aarch64 = clash-for-windows-electron-bin-0.19.27-aarch64-linux.tar.gz::https://github.com/Fndroid/clash_for_windows_pkg/releases/download/0.19.27/Clash.for.Windows-0.19.27-arm64-linux.tar.gz
+	sha256sums_aarch64 = 535616e98692998f18055290ba96d811e2abcb9cf1baabe88da3388d47141113
 
 pkgname = clash-for-windows-electron-bin
diff --git a/PKGBUILD b/PKGBUILD
index c6aac5a4ff12..1090dbcebd3c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,55 +1,53 @@
 # Maintainer: sukanka <su975853527 [AT] gmail.com>
 pkgname=clash-for-windows-electron-bin
 _pkgname=${pkgname%-bin}
-pkgver=0.19.26
+pkgver=0.19.27
 pkgrel=1
 pkgdesc="A Windows/macOS/Linux GUI based on Clash and Electron. Using system clash and electron"
-arch=("x86_64")
-parch=$(echo ${arch} | sed "s/x86_64/x64/")
+arch=("x86_64" "aarch64")
 license=('unknown')
 url="https://github.com/Fndroid/clash_for_windows_pkg"
 install=clash-for-windows-bin.install
-
 provides=('clash-for-windows' ${_pkgname})
 conflicts=('clash-for-windows' 'clash-for-windows-bin')
-
 depends=('electron'
 'clash'
 'clash-geoip'
 )
-
 optdepends=(
     'nftables: TUN mode required.'
     'iproute2: TUN mode required.'
     'clash-premium-tun: TUN mode required'
 )
-makedepends=('asar'
-'npm'
-)
-
+makedepends=('asar' 'npm')
+source_x86_64=("${pkgname}-${pkgver}-x86_64-linux.tar.gz::${url}/releases/download/${pkgver}/Clash.for.Windows-${pkgver}-amd64-linux.tar.gz")
+source_aarch64=("${pkgname}-${pkgver}-aarch64-linux.tar.gz::${url}/releases/download/${pkgver}/Clash.for.Windows-${pkgver}-arm64-linux.tar.gz")
 source=(
-    "${pkgname}-${pkgver}-${arch}-linux.tar.gz::${url}/releases/download/${pkgver}/Clash.for.Windows-${pkgver}-${parch}-linux.tar.gz"
     "clash-for-windows.desktop"
     "cfw"
-    "clash-core-service@.service"
-    )
-sha256sums=('ba02c4cb961ff26809fd5b3bc9da333f9164029c2bc92a771fa5f2b9672369d6'
-            '340ee7a8c8e7da27eca9891dbc6997e7b2d87607947e8010903fb79d1fbb9da6'
+    "cfw-start-pre.sh"
+    "clash-core-service@.service")
+sha256sums=('9a84b05b718913d3d1fbe462a2da671abff2cb94bb2ded75a3af12204cebe32f'
             'db2e160e5d5cf82ed69d0926ac51c0eccb9efc541f89be3bb467d85be509f735'
-            'c199f6b11d32d9ef70316420cc9b6b78c0491d1c687a85ae570d76113d72d761')
+            '2d1cb05f33eef51d01bca397ac52796a557b812b243f0d5e5377f7640e4d4433'
+            '54d4d262356044fb75ce7bdee662aa44046842f9c70765cd6dd0185415388409')
+sha256sums_x86_64=('5691f43c07e1a07e773f713062f255a472d6e6bfbae4a8ff278b125d2999bd98')
+sha256sums_aarch64=('535616e98692998f18055290ba96d811e2abcb9cf1baabe88da3388d47141113')
 
+_parch=$(echo ${arch} | sed "s/x86_64/x64/;s/aarch64/arm64/")
 build() {
     cd $srcdir
     sed -i "s/pkgver/${pkgver}/" clash-for-windows.desktop
-    
-    cd "Clash for Windows-${pkgver}-${parch}-linux"/resources/
+
+    cd "Clash for Windows-${pkgver}-${_parch}-linux"/resources/
     asar e app.asar apps
-    
+
     # fix for autostart and system electron
     cd apps
     sed -i 's|r=n\[1\],|r="cfw\\nIcon=clash\\n",|g' dist/electron/renderer.js
     sed -i 's|"electron-log": "^4.1.0",|"electron-log": "^4.4.6",|g' package.json
-    
+
+    export HOME=$srcdir
     npm install
     cd ..
     asar p apps app.asar
@@ -57,21 +55,22 @@ build() {
 
 package() {
     cd $srcdir
-    
+
     install -Dm755 cfw -t ${pkgdir}/usr/bin
     install -Dm644 "clash-for-windows.desktop" -t ${pkgdir}/usr/share/applications
     install -Dm644 "clash-core-service@.service" -t ${pkgdir}/usr/lib/systemd/system/
-    
-    cd "Clash for Windows-${pkgver}-${parch}-linux"
+    install -Dm755 cfw-start-pre.sh -t ${pkgdir}/opt/clash-for-windows
+
+    cd "Clash for Windows-${pkgver}-${_parch}-linux"
     install -Dm644 resources/app.asar -t ${pkgdir}/opt/clash-for-windows/
-    
+
     cp -pvr resources/static ${pkgdir}/opt/clash-for-windows/
-    
+
     cd resources/apps/dist/electron/static/imgs
     install -Dm644 logo.png ${pkgdir}/usr/share/icons/hicolor/512x512/apps/clash.png
-    
+
     cd ${pkgdir}/opt/clash-for-windows/static/files
-    rm -rf linux/{common,x64/clash-linux} default/Country.mmdb
-    ln -s /usr/bin/clash linux/x64/clash-linux
+    rm -rf linux/{common,${_parch}/clash-linux} default/Country.mmdb
+    ln -s /usr/bin/clash linux/${_parch}/clash-linux
     ln -s /etc/clash/Country.mmdb default/Country.mmdb
 }
diff --git a/cfw-start-pre.sh b/cfw-start-pre.sh
new file mode 100644
index 000000000000..7c0a4f372598
--- /dev/null
+++ b/cfw-start-pre.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+_parch=$(uname -m | sed "s/x86_64/x64/;s/aarch64/arm64/")
+install -Dm644 -o $1 -g $1 /etc/clash/Country.mmdb -t "/home/$1/.config/clash"
+install -Dm755 -o $1 -g $1 \
+    "/opt/clash-for-windows/static/files/linux/${_parch}/service/clash-core-service" \
+    -t "/home/$1/.config/clash/service"
diff --git a/clash-core-service@.service b/clash-core-service@.service
index 3974317d3b41..d226a9e25e3b 100644
--- a/clash-core-service@.service
+++ b/clash-core-service@.service
@@ -4,11 +4,7 @@ After=network-online.target nftables.service iptabels.service
 
 [Service]
 Type=simple
-ExecStartPre=/usr/bin/install -Dm644 -o %i -g %i /etc/clash/Country.mmdb  \
-    -t /home/%i/.config/clash
-ExecStartPre=/usr/bin/install -Dm755 -o %i -g %i \
-    /opt/clash-for-windows/static/files/linux/x64/service/clash-core-service \
-    -t /home/%i/.config/clash/service
+ExecStartPre=/opt/clash-for-windows/cfw-start-pre.sh %i
 ExecStartPre=+/usr/share/clash/setup-cgroup.sh
 ExecStart=/usr/share/clash/bypass-proxy /home/%i/.config/clash/service/clash-core-service
 Restart=always
diff --git a/clash-for-windows.desktop b/clash-for-windows.desktop
index 09a9c60fb695..cbb0bfce8812 100644
--- a/clash-for-windows.desktop
+++ b/clash-for-windows.desktop
@@ -4,7 +4,7 @@ Version=pkgver
 Name=Clash For Windows
 Comment=Clash GUI
 Exec=cfw
-Icon=clash.png
+Icon=clash
 Terminal=false
 Keywords=clash
 Categories=Network;Utility;