Update to 2.17

6 files changed, 78 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 26de0b09b19b..4e02c9dd7026 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,25 @@
 pkgbase = nekoray-bin
 	pkgdesc = Qt based cross-platform GUI proxy configuration manager (backend: v2ray / sing-box)
-	pkgver = 2.14
+	pkgver = 2.17
 	pkgrel = 1
 	url = https://github.com/MatsuriDayo/nekoray
+	install = notice.install
 	arch = x86_64
 	license = GPL 3.0
-	depends = qt5-base
+	depends = qt5-base>=5.15
 	depends = qt5-svg
 	depends = qt5-tools
 	depends = qt5-x11extras
 	optdepends = v2ray-domain-list-community: geosite data for NekoRay
 	optdepends = v2ray-geoip: geoip data for NekoRay
-	optdepends = hysteria: Hysteria support for Nekoray
-	optdepends = sing-geoip: geoip data for NekoBox
-	optdepends = sing-geosite: geosite data for NekoBox
-	conflicts = nekoray
+	provides = nekoray
 	conflicts = nekoray-git
-	source = https://github.com/MatsuriDayo/nekoray/releases/download/2.14/nekoray-2.14-2023-02-04-linux64.zip
+	conflicts = nekoray
+	source = nekoray-bin-2.17.zip::https://github.com/MatsuriDayo/nekoray/releases/download/2.17/nekoray-2.17-2023-02-25-linux64.zip
 	source = nekoray.desktop
-	sha256sums = c483a5debd37c17cca5e98d6808f06f6d836a4a46985f4a60d0de4128c5d6e24
-	sha256sums = f91e598c4fb016527c05702357178126ed2faae1f7e6e71a47afde520832c33d
+	source = nekoray.sh
+	sha256sums = 9fb69fbafe544c3a8d6560287adf33521858da64e2b9fe8f0751fa29082f6a24
+	sha256sums = 86f1332c81be2c346a4cdc80a3550f6484ef89e4ee8d4f23afada0c2d0a184e2
+	sha256sums = 5a7cbb61608137924fb1ba3ecb057adb7973f5775f64758736b447041fa15377
 
 pkgname = nekoray-bin
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..27c30d14475b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+pkg/
+src/
+*.zip
+*.tar.zst
diff --git a/PKGBUILD b/PKGBUILD
index af042a810e1d..2cc5f79954d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,54 +1,49 @@
-# Maintainer: Molyuu <zhangjtroger@gmail.com>
-pkgname='nekoray-bin'
-pkgver=2.14
-_releasedate=2023-02-04
+# Maintainer: Ali Molaei <ali dot molaei at protonmail dot com>
+# Contributor: Maz <m47h4r at gmail dot com>
+# Contributor: Molyuu <zhangjtroger at gmail dot com>
+
+pkgname=nekoray-bin
+pkgver=2.17
+_releasedate=2023-02-25
 pkgrel=1
-pkgdesc='Qt based cross-platform GUI proxy configuration manager (backend: v2ray / sing-box)'
+pkgdesc="Qt based cross-platform GUI proxy configuration manager (backend: v2ray / sing-box)"
 arch=('x86_64')
-url='https://github.com/MatsuriDayo/nekoray'
+url="https://github.com/MatsuriDayo/nekoray"
 license=('GPL 3.0')
-depends=(
-    'qt5-base' 'qt5-svg' 'qt5-tools' 'qt5-x11extras'
-)
-conflicts=('nekoray' 'nekoray-git')
-
+groups=()
+depends=('qt5-base>=5.15' 'qt5-svg' 'qt5-tools' 'qt5-x11extras')
+provides=('nekoray')
+conflicts=('nekoray-git' 'nekoray')
 optdepends=(
     'v2ray-domain-list-community: geosite data for NekoRay'
     'v2ray-geoip: geoip data for NekoRay'
-    'hysteria: Hysteria support for Nekoray'
-    # AUR
-    'sing-geoip: geoip data for NekoBox'
-    'sing-geosite: geosite data for NekoBox'
 )
 
+install=notice.install
+
 source=(
-    "https://github.com/MatsuriDayo/nekoray/releases/download/$pkgver/nekoray-$pkgver-$_releasedate-linux64.zip"
-    'nekoray.desktop'
+	"${pkgname}-${pkgver}.zip::${url}/releases/download/${pkgver}/nekoray-${pkgver}-${_releasedate}-linux64.zip"
+	"nekoray.desktop"
+  "nekoray.sh"
 )
+
 sha256sums=(
-    'c483a5debd37c17cca5e98d6808f06f6d836a4a46985f4a60d0de4128c5d6e24'
-    'f91e598c4fb016527c05702357178126ed2faae1f7e6e71a47afde520832c33d'
+	'9fb69fbafe544c3a8d6560287adf33521858da64e2b9fe8f0751fa29082f6a24'
+	'86f1332c81be2c346a4cdc80a3550f6484ef89e4ee8d4f23afada0c2d0a184e2'
+	'5a7cbb61608137924fb1ba3ecb057adb7973f5775f64758736b447041fa15377'
 )
 
 package() {
-	# Prepare
-	cd $srcdir
-    rm -rf nekoray
-	unzip "nekoray-$pkgver-$_releasedate-linux64.zip"
-	chown -R "$USER":"$USER" "nekoray"
-	mkdir -p "${pkgdir}/usr/lib/nekoray"
-    mkdir -p "${pkgdir}/usr/bin"
-    mkdir -p "${pkgdir}/usr/share/applications"
-	mkdir -p "${pkgdir}/usr/share/icons/hicolor/128x128/apps"
-	# icons & desktop
-	cp "${srcdir}/nekoray.desktop" "${pkgdir}/usr/share/applications/nekoray.desktop"
-    cp -a "${srcdir}/nekoray/nekoray.png" "${pkgdir}/usr/lib/nekoray/"
-    cp -a "${srcdir}/nekoray/nekobox.png" "${pkgdir}/usr/lib/nekoray/"
-    ln -s "/usr/lib/nekoray/nekoray.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/nekoray.png"
-    ln -s "/usr/lib/nekoray/nekobox.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/nekobox.png"
-	# binary
-	cp -a "${srcdir}/nekoray/nekoray_core" "${pkgdir}/usr/lib/nekoray/"
-	cp -a "${srcdir}/nekoray/nekobox_core" "${pkgdir}/usr/lib/nekoray/"
-	cp -a "${srcdir}/nekoray/nekoray" "${pkgdir}/usr/lib/nekoray/"
-	ln -s  "/usr/lib/nekoray/nekoray" "${pkgdir}/usr/bin/nekoray"
-}
\ No newline at end of file
+  mkdir -p ${pkgdir}/usr/bin/
+  mkdir -p ${pkgdir}/usr/lib/nekoray/
+  mkdir -p ${pkgdir}/usr/share/icons/hicolor/128x128/apps/
+
+  install -Dt ${pkgdir}/usr/lib/nekoray/ -m755 ./nekoray/nekobox_core
+  install -Dt ${pkgdir}/usr/lib/nekoray/ -m755 ./nekoray/nekoray_core
+  install -Dt ${pkgdir}/usr/lib/nekoray/ -m755 ./nekoray/nekoray
+	install -Dm755 ./nekoray.sh ${pkgdir}/usr/bin/nekoray 
+
+	install -Dt ${pkgdir}/usr/share/applications/ -m644 ./nekoray.desktop
+	install -Dt ${pkgdir}/usr/share/icons/hicolor/128x128/apps/ -m644 ./nekoray/nekoray.png
+}
+
diff --git a/nekoray.desktop b/nekoray.desktop
index 9d3e4dde7a3d..ccb93c85d45a 100644
--- a/nekoray.desktop
+++ b/nekoray.desktop
@@ -1,11 +1,10 @@
 [Desktop Entry]
-Version=1.0
-Terminal=false
-Type=Application
-Name=NekoRay
-Categories=Network;
+Name=Nekoray
 Comment=Qt based cross-platform GUI proxy configuration manager (backend: v2ray / sing-box)
-Comment[zh_CN]=基于 Qt 的跨平台代理配置管理器 (后端 v2ray / sing-box)
-Keywords=Internet;VPN;Proxy;v2ray;sing-box;
-Exec=/usr/bin/nekoray
-Icon=/usr/share/icons/hicolor/128x128/apps/nekoray.png
+Exec=nekoray -- -appdata
+Icon=nekoray
+Type=Application
+StartupNotify=true
+Categories=Network;Utility;
+StartupWMClass=nekoray
+
diff --git a/nekoray.sh b/nekoray.sh
new file mode 100755
index 000000000000..45dce0b96d1c
--- /dev/null
+++ b/nekoray.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/lib/nekoray/nekoray -- -appdata
diff --git a/notice.install b/notice.install
new file mode 100644
index 000000000000..5c39d9f547a3
--- /dev/null
+++ b/notice.install
@@ -0,0 +1,18 @@
+notice() {
+        echo "###############################################################"
+        echo " ###############           NOTICE             ################ "
+        echo "###############################################################"
+        echo "# This package is now more standard and will not install      #"
+        echo "# in your home directory, the side effect is that your        #"
+        echo "# old configurations are not in the app when you launch       #"
+        echo "# the new version, if you want them, please run this          #"
+        echo "# command manually:                                           #"
+				echo "#                                                             #"
+        echo "# cp -R ~/.local/opt/nekoray/config ~/.config/nekoray/        #"
+        echo "#                                                             #"
+        echo "###############################################################"
+}
+
+pre_upgrade() {
+        notice
+}