Changed install dir from /usr/local to /usr/share. Fixed update command

typo

4 files changed, 46 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6745c87a07b0..42711577d632 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kcptun-plugin-git
 	pkgdesc = SIP003-compatible KCPTUN and UDP2RAW plugins for shadowsocks-libev
-	pkgver = r23.761add6
+	pkgver = r27.30c848a
 	pkgrel = 2
 	url = https://github.com/w1ndy/kcptun-plugins
 	install = kcptun-plugin.install
@@ -12,8 +12,10 @@ pkgbase = kcptun-plugin-git
 	depends = curl
 	source = kcptun-plugin::git+https://github.com/w1ndy/kcptun-plugins.git
 	source = kcptun-plugin.install
+	source = 0001-local_to_share.patch
 	sha256sums = SKIP
 	sha256sums = c82d867ca2d468855944e34df47336e007d06126beb169c409e58f1ce2402229
+	sha256sums = 961c584fe20e340877bade0a012218157c2c4d4efe37a7b563174084e4ac48c9
 
 pkgname = kcptun-plugin-git
 
diff --git a/0001-local_to_share.patch b/0001-local_to_share.patch
new file mode 100644
index 000000000000..a2b838769fc6
--- /dev/null
+++ b/0001-local_to_share.patch
@@ -0,0 +1,26 @@
+diff --git a/kcptun-client-plugin b/kcptun-client-plugin
+index f963d89..28bd3c5 100755
+--- a/kcptun-client-plugin
++++ b/kcptun-client-plugin
+@@ -3,7 +3,7 @@
+ set -e
+ 
+ if [ ! -f $(basename $0) ]; then
+-    cd /usr/local/kcptun_plugins;
++    cd /usr/share/kcptun_plugins;
+ fi
+ 
+ source ./lib
+diff --git a/kcptun-server-plugin b/kcptun-server-plugin
+index ea97668..cd3de6b 100755
+--- a/kcptun-server-plugin
++++ b/kcptun-server-plugin
+@@ -3,7 +3,7 @@
+ set -e
+ 
+ if [ ! -f $(basename $0) ]; then
+-    cd /usr/local/kcptun_plugins;
++    cd /usr/share/kcptun_plugins;
+ fi
+ 
+ source ./lib
diff --git a/PKGBUILD b/PKGBUILD
index 6671d761fb0f..2608fc2a1fa8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname='kcptun-plugin'
 pkgname="${_pkgname}-git"
-pkgver=r23.761add6
+pkgver=r27.30c848a
 pkgrel=2
 pkgdesc='SIP003-compatible KCPTUN and UDP2RAW plugins for shadowsocks-libev'
 license=('custom:Unlicense')
@@ -12,23 +12,31 @@ depends=('glibc' 'curl')
 makedepends=('git' 'make')
 source=("${_pkgname}::git+${url}.git"
 		"${_pkgname}.install"
-		)
+		"0001-local_to_share.patch")
 install="${_pkgname}.install"
 sha256sums=('SKIP'
-			'c82d867ca2d468855944e34df47336e007d06126beb169c409e58f1ce2402229')
+			'c82d867ca2d468855944e34df47336e007d06126beb169c409e58f1ce2402229'
+			'961c584fe20e340877bade0a012218157c2c4d4efe37a7b563174084e4ac48c9')
 
 pkgver() {
 	cd "${srcdir}/${_pkgname}"
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+	cd "${srcdir}/${_pkgname}"
+	for p in ${srcdir}/*.patch; do
+		patch -Np1 -i "$p"
+	done
+}
+
 package() {
 	cd "${srcdir}/${_pkgname}"
-	install -dm 755 "${pkgdir}/usr/local/kcptun_plugins" "${pkgdir}/usr/bin"
-	install -Dm 755 'ss-proxy' 'kcptun-client-plugin' 'kcptun-server-plugin' 'lib' "${pkgdir}/usr/local/kcptun_plugins/"
-	ln -s '/usr/local/kcptun_plugins/ss-proxy' "${pkgdir}/usr/bin/ss-proxy"
-	ln -s '/usr/local/kcptun_plugins/kcptun-client-plugin' "${pkgdir}/usr/bin/kcptun-client-plugin"
-	ln -s '/usr/local/kcptun_plugins/kcptun-server-plugin' "${pkgdir}/usr/bin/kcptun-server-plugin"
+	install -dm 755 "${pkgdir}/usr/share/kcptun_plugins" "${pkgdir}/usr/bin"
+	install -Dm 755 'ss-proxy' 'kcptun-client-plugin' 'kcptun-server-plugin' 'lib' "${pkgdir}/usr/share/kcptun_plugins/"
+	ln -s '/usr/share/kcptun_plugins/ss-proxy' "${pkgdir}/usr/bin/ss-proxy"
+	ln -s '/usr/share/kcptun_plugins/kcptun-client-plugin' "${pkgdir}/usr/bin/kcptun-client-plugin"
+	ln -s '/usr/share/kcptun_plugins/kcptun-server-plugin' "${pkgdir}/usr/bin/kcptun-server-plugin"
 
 	install -Dm 644 'LICENSE' "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/kcptun-plugin.install b/kcptun-plugin.install
index 2a43f4b324df..2afb20ea34c3 100644
--- a/kcptun-plugin.install
+++ b/kcptun-plugin.install
@@ -1,5 +1,5 @@
 post_install() {
-	echo "Run 'kcptun-client-plugins upgrade' or 'kcptun-server-plugins upgrade' as root to download kcptun and udp2raw binaries"
+	echo "Run 'kcptun-client-plugin upgrade' or 'kcptun-server-plugin upgrade' as root to download kcptun and udp2raw binaries"
 	echo "You can only have one set of binaries installed"
 }