refactor and simplify

3 files changed, 45 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f3f0266e022a..ee50fb3abe0a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = naiveproxy-bin
-	pkgdesc = Camouflage network traffic with strong censorship resistence and low detectablility.
+	pkgdesc = Camouflage network traffic with strong censorship resistence and low detectablility
 	pkgver = 108.0.5359.94_1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/klzgrad/naiveproxy
 	arch = aarch64
 	arch = i686
@@ -19,37 +19,37 @@ pkgbase = naiveproxy-bin
 	source_aarch64 = naiveproxy.service.tmpl
 	source_aarch64 = naiveproxy-sysusers.conf
 	sha256sums_aarch64 = 2bba2135d21f9672389703c6e8d423a424163a7573d61f02c32e8acd913578e7
-	sha256sums_aarch64 = af56b8d7647e74cd4441818ee5197ef9858aefef7648d050b5b09486c090cbc3
+	sha256sums_aarch64 = ae4f1f5bb078b0729950a97d6a1e53b07af39039406745bcc293ddba15c06c49
 	sha256sums_aarch64 = 8124ab508627d36a73167e30c1a7912489b6a08124e3ef71234b1fca2656cd3c
 	source_i686 = naiveproxy-v108.0.5359.94-1-i686.tar.xz::https://github.com/klzgrad/naiveproxy/releases/download/v108.0.5359.94-1/naiveproxy-v108.0.5359.94-1-linux-x86.tar.xz
 	source_i686 = naiveproxy.service.tmpl
 	source_i686 = naiveproxy-sysusers.conf
 	sha256sums_i686 = cceb04abc7d1145f21bc348df4f7a0d927fa9be00410eb20710150d7b85df935
-	sha256sums_i686 = af56b8d7647e74cd4441818ee5197ef9858aefef7648d050b5b09486c090cbc3
+	sha256sums_i686 = ae4f1f5bb078b0729950a97d6a1e53b07af39039406745bcc293ddba15c06c49
 	sha256sums_i686 = 8124ab508627d36a73167e30c1a7912489b6a08124e3ef71234b1fca2656cd3c
 	source_mips64el = naiveproxy-v108.0.5359.94-1-mips64el.tar.xz::https://github.com/klzgrad/naiveproxy/releases/download/v108.0.5359.94-1/naiveproxy-v108.0.5359.94-1-linux-mips64el.tar.xz
 	source_mips64el = naiveproxy.service.tmpl
 	source_mips64el = naiveproxy-sysusers.conf
 	sha256sums_mips64el = 262eefc173afeae53acffe5a3d5119654853fd34bd83c243a43d67b35b3e1a64
-	sha256sums_mips64el = af56b8d7647e74cd4441818ee5197ef9858aefef7648d050b5b09486c090cbc3
+	sha256sums_mips64el = ae4f1f5bb078b0729950a97d6a1e53b07af39039406745bcc293ddba15c06c49
 	sha256sums_mips64el = 8124ab508627d36a73167e30c1a7912489b6a08124e3ef71234b1fca2656cd3c
 	source_mipsel = naiveproxy-v108.0.5359.94-1-mipsel.tar.xz::https://github.com/klzgrad/naiveproxy/releases/download/v108.0.5359.94-1/naiveproxy-v108.0.5359.94-1-linux-mipsel.tar.xz
 	source_mipsel = naiveproxy.service.tmpl
 	source_mipsel = naiveproxy-sysusers.conf
 	sha256sums_mipsel = c97679323f4382ef4d47af1f66a6a3e0a61884b95ea8cdff67b84e7fd2ffa730
-	sha256sums_mipsel = af56b8d7647e74cd4441818ee5197ef9858aefef7648d050b5b09486c090cbc3
+	sha256sums_mipsel = ae4f1f5bb078b0729950a97d6a1e53b07af39039406745bcc293ddba15c06c49
 	sha256sums_mipsel = 8124ab508627d36a73167e30c1a7912489b6a08124e3ef71234b1fca2656cd3c
 	source_x86_64 = naiveproxy-v108.0.5359.94-1-x86_64.tar.xz::https://github.com/klzgrad/naiveproxy/releases/download/v108.0.5359.94-1/naiveproxy-v108.0.5359.94-1-linux-x64.tar.xz
 	source_x86_64 = naiveproxy.service.tmpl
 	source_x86_64 = naiveproxy-sysusers.conf
 	sha256sums_x86_64 = e0a9854cb9351cfb5cf05a13d525571b8d1b1f4cc507759e28058adde938fac8
-	sha256sums_x86_64 = af56b8d7647e74cd4441818ee5197ef9858aefef7648d050b5b09486c090cbc3
+	sha256sums_x86_64 = ae4f1f5bb078b0729950a97d6a1e53b07af39039406745bcc293ddba15c06c49
 	sha256sums_x86_64 = 8124ab508627d36a73167e30c1a7912489b6a08124e3ef71234b1fca2656cd3c
 	source_armv7h = naiveproxy-v108.0.5359.94-1-armv7h.tar.xz::https://github.com/klzgrad/naiveproxy/releases/download/v108.0.5359.94-1/naiveproxy-v108.0.5359.94-1-linux-arm.tar.xz
 	source_armv7h = naiveproxy.service.tmpl
 	source_armv7h = naiveproxy-sysusers.conf
 	sha256sums_armv7h = 9c3977716201e6e0deee6917b43880181862af4a0bac4e60b0ca4acc88dc46cf
-	sha256sums_armv7h = af56b8d7647e74cd4441818ee5197ef9858aefef7648d050b5b09486c090cbc3
+	sha256sums_armv7h = ae4f1f5bb078b0729950a97d6a1e53b07af39039406745bcc293ddba15c06c49
 	sha256sums_armv7h = 8124ab508627d36a73167e30c1a7912489b6a08124e3ef71234b1fca2656cd3c
 
 pkgname = naiveproxy-bin
diff --git a/PKGBUILD b/PKGBUILD
index c3d35b175bcb..bbea5796faac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,50 +4,54 @@
 # Contributor: navigaid <navigaid@gmail.com>
 
 _name=naiveproxy
-_version=v108.0.5359.94-1
-pkgrel=2
-pkgdesc='Camouflage network traffic with strong censorship resistence and low detectablility.'
-url='https://github.com/klzgrad/naiveproxy'
-license=('BSD')
-
 pkgname=${_name}-bin
+
+pkgrel=3
+_version=v108.0.5359.94-1
 pkgver=${_version//-/_}
 pkgver=${pkgver#v}
 
+pkgdesc='Camouflage network traffic with strong censorship resistence and low detectablility'
+url='https://github.com/klzgrad/naiveproxy'
+license=('BSD')
+
 provides=("${_name}")
 conflicts=("${_name}")
 depends=('gcc-libs')
 options=('!strip') # don't modify prebuilt binaries
 
-_source_local=(
+# source array template
+# @ARCH@ and @SRCARCH@ will be substituted per the _archmap array below
+_source=(
+	"${_name}-${_version}-@ARCH@.tar.xz::${url}/releases/download/${_version}/naiveproxy-${_version}-linux-@SRCARCH@.tar.xz"
 	naiveproxy.service.tmpl
 	naiveproxy-sysusers.conf
 )
 
-_ext='tar.xz'
-_source="${url}/releases/download/${_version}/naiveproxy-${_version}-linux-@SRCARCH@.${_ext}"
-
+# architectures and their counterparts used in the source URL
 declare -Ag _archmap=(
 #	[ARCH]=SRCARCH
-	[x86_64]=x64
-	[i686]=x86
-	[aarch64]=arm64
-	[armv7h]=arm
-	[mips64el]=mips64el
-	[mipsel]=mipsel
+	['x86_64']='x64'
+	['i686']='x86'
+	['aarch64']='arm64'
+	['armv7h']='arm'
+	['mips64el']='mips64el'
+	['mipsel']='mipsel'
 )
 
-_config_src='config.json'
-_config_dest="/etc/naiveproxy/config.json"
-backup=("${_config_dest#/}")
+# config file's path
+_config="/etc/naiveproxy/config.json"
+backup=("${_config#/}")
 
 # generate systemd services from the template
 prepare()
 {
-	TMPL_CONFIG="${_config_dest}" \
+	# regular service
+	TMPL_CONFIG_FILE_PATH="${_config}" \
 		_envsubst naiveproxy.service.tmpl naiveproxy.service
 
-	TMPL_CONFIG="${_config_dest%/*}/'%i'.${_config_dest##*.}" \
+	# multi-instance service (http://0pointer.net/blog/projects/instances.html)
+	TMPL_CONFIG_FILE_PATH="${_config%/*}/'%i'.${_config##*.}" \
 		_envsubst naiveproxy.service.tmpl naiveproxy@.service
 }
 
@@ -59,19 +63,19 @@ package()
 
 	cd "naiveproxy-${_version}-linux-${_archmap[$CARCH]}"
 
-	install -Dm644 ${_config_src}  "${pkgdir}${_config_dest}"
+	install -Dm644 config.json     "${pkgdir}${_config}"
 	install -Dm755 naive           "${pkgdir}/usr/bin/naiveproxy"
 	install -Dm644 USAGE.txt       "${pkgdir}/usr/share/doc/naiveproxy/USAGE.txt"
 	install -Dm644 LICENSE         "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
-# boilerplate for generating the 'arch' and 'source_<arch>' arrays
+# boilerplate for generating the "arch=()" and "source_<arch>=()" arrays
 arch=("${!_archmap[@]}")
 for _a in "${!_archmap[@]}"; do
 	_sa=${_archmap[$_a]}
-	_s=${_source/@SRCARCH@/$_sa}
-	_n="${_name}-${_version}-${_a}.${_ext}"
-	declare -ag "source_${_a}"'=(${_n}::${_s} "${_source_local[@]}")'
+	_s=("${_source[@]//@ARCH@/$_a}")
+	_s=("${_s[@]//@SRCARCH@/$_sa}")
+	declare -ag "source_${_a}="'("${_s[@]}")'
 done
 
 # wrapper function for envsubst
@@ -88,31 +92,31 @@ _envsubst()
 
 sha256sums_aarch64=(
 	'2bba2135d21f9672389703c6e8d423a424163a7573d61f02c32e8acd913578e7'
-	'af56b8d7647e74cd4441818ee5197ef9858aefef7648d050b5b09486c090cbc3'
+	'ae4f1f5bb078b0729950a97d6a1e53b07af39039406745bcc293ddba15c06c49'
 	'8124ab508627d36a73167e30c1a7912489b6a08124e3ef71234b1fca2656cd3c'
 )
 sha256sums_i686=(
 	'cceb04abc7d1145f21bc348df4f7a0d927fa9be00410eb20710150d7b85df935'
-	'af56b8d7647e74cd4441818ee5197ef9858aefef7648d050b5b09486c090cbc3'
+	'ae4f1f5bb078b0729950a97d6a1e53b07af39039406745bcc293ddba15c06c49'
 	'8124ab508627d36a73167e30c1a7912489b6a08124e3ef71234b1fca2656cd3c'
 )
 sha256sums_mips64el=(
 	'262eefc173afeae53acffe5a3d5119654853fd34bd83c243a43d67b35b3e1a64'
-	'af56b8d7647e74cd4441818ee5197ef9858aefef7648d050b5b09486c090cbc3'
+	'ae4f1f5bb078b0729950a97d6a1e53b07af39039406745bcc293ddba15c06c49'
 	'8124ab508627d36a73167e30c1a7912489b6a08124e3ef71234b1fca2656cd3c'
 )
 sha256sums_mipsel=(
 	'c97679323f4382ef4d47af1f66a6a3e0a61884b95ea8cdff67b84e7fd2ffa730'
-	'af56b8d7647e74cd4441818ee5197ef9858aefef7648d050b5b09486c090cbc3'
+	'ae4f1f5bb078b0729950a97d6a1e53b07af39039406745bcc293ddba15c06c49'
 	'8124ab508627d36a73167e30c1a7912489b6a08124e3ef71234b1fca2656cd3c'
 )
 sha256sums_x86_64=(
 	'e0a9854cb9351cfb5cf05a13d525571b8d1b1f4cc507759e28058adde938fac8'
-	'af56b8d7647e74cd4441818ee5197ef9858aefef7648d050b5b09486c090cbc3'
+	'ae4f1f5bb078b0729950a97d6a1e53b07af39039406745bcc293ddba15c06c49'
 	'8124ab508627d36a73167e30c1a7912489b6a08124e3ef71234b1fca2656cd3c'
 )
 sha256sums_armv7h=(
 	'9c3977716201e6e0deee6917b43880181862af4a0bac4e60b0ca4acc88dc46cf'
-	'af56b8d7647e74cd4441818ee5197ef9858aefef7648d050b5b09486c090cbc3'
+	'ae4f1f5bb078b0729950a97d6a1e53b07af39039406745bcc293ddba15c06c49'
 	'8124ab508627d36a73167e30c1a7912489b6a08124e3ef71234b1fca2656cd3c'
 )
diff --git a/naiveproxy.service.tmpl b/naiveproxy.service.tmpl
index aa58e7668ea4..7cbc3b9ebd02 100644
--- a/naiveproxy.service.tmpl
+++ b/naiveproxy.service.tmpl
@@ -8,7 +8,7 @@ Type=simple
 User=naiveproxy
 Restart=on-failure
 RestartSec=5s
-ExecStart=/usr/bin/naiveproxy ${TMPL_CONFIG}
+ExecStart=/usr/bin/naiveproxy ${TMPL_CONFIG_FILE_PATH}
 
 # sandboxing
 ProcSubset=pid