Refactoring according AUR guidelines

2 files changed, 27 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index abd9cad5583a..3043e578afaf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wireguard-ui-bin
 	pkgdesc = A web user interface to manage your WireGuard setup.
 	pkgver = 0.5.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/ngoduykhanh/wireguard-ui
 	install = wireguard-ui.install
 	arch = i686
@@ -9,14 +9,17 @@ pkgbase = wireguard-ui-bin
 	arch = armv7h
 	arch = aarch64
 	license = MIT
+	depends = bash
 	depends = wireguard-tools
 	provides = wireguard-ui
 	conflicts = wireguard-ui
+	source = https://raw.githubusercontent.com/ngoduykhanh/wireguard-ui/master/LICENSE
 	source = wireguard-ui.service
 	source = 99-wg.conf
 	source = wgiptables.sh
 	source = wg-reload.path
 	source = wg-reload.service
+	sha256sums = e693e8a42aab8dfe07bb9210b5ab54facf61c1248b7f69a622791f293a22cf96
 	sha256sums = c60cbe2d47c616a2f9984c6c57ef60e810c7e57ca5054a318b3da8770bf03b76
 	sha256sums = cf5bdce2ce87b5054042a70d8630f40a0f991c64c42786824f660245b943d2be
 	sha256sums = bc8b1cee00a541eab44dab5bd23afddb99d9c667a5d4d083d7bf9575b321052c
diff --git a/PKGBUILD b/PKGBUILD
index 110b72bcede1..27211d91fde6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,24 @@
 # Maintainer: Nebulosa  <nebulosa2007-at-yandex-dot-ru>
+
 pkgname=wireguard-ui-bin
-_pkgname=wireguard-ui
 pkgver=0.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A web user interface to manage your WireGuard setup."
-arch=('i686' 'x86_64' 'armv7h' 'aarch64')
-url="https://github.com/ngoduykhanh/$_pkgname"
-license=('MIT')
-source=($_pkgname.service
+arch=(i686 x86_64 armv7h aarch64)
+url="https://github.com/ngoduykhanh/${pkgname%-bin}"
+license=(MIT)
+source=(https://raw.githubusercontent.com/ngoduykhanh/${pkgname%-bin}/master/LICENSE
+        ${pkgname%-bin}.service
         99-wg.conf
         wgiptables.sh
         wg-reload.path
         wg-reload.service)
-
-source_i686=($url/releases/download/v$pkgver/$_pkgname-v$pkgver-linux-386.tar.gz)
-source_x86_64=($url/releases/download/v$pkgver/$_pkgname-v$pkgver-linux-amd64.tar.gz)
-source_armv7h=($url/releases/download/v$pkgver/$_pkgname-v$pkgver-linux-arm.tar.gz)
-source_aarch64=($url/releases/download/v$pkgver/$_pkgname-v$pkgver-linux-arm64.tar.gz)
-
-sha256sums=('c60cbe2d47c616a2f9984c6c57ef60e810c7e57ca5054a318b3da8770bf03b76'
+source_i686=(${url}/releases/download/v${pkgver}/${pkgname%-bin}-v${pkgver}-linux-386.tar.gz)
+source_x86_64=(${url}/releases/download/v${pkgver}/${pkgname%-bin}-v${pkgver}-linux-amd64.tar.gz)
+source_armv7h=(${url}/releases/download/v${pkgver}/${pkgname%-bin}-v${pkgver}-linux-arm.tar.gz)
+source_aarch64=(${url}/releases/download/v${pkgver}/${pkgname%-bin}-v${pkgver}-linux-arm64.tar.gz)
+sha256sums=('e693e8a42aab8dfe07bb9210b5ab54facf61c1248b7f69a622791f293a22cf96'
+            'c60cbe2d47c616a2f9984c6c57ef60e810c7e57ca5054a318b3da8770bf03b76'
             'cf5bdce2ce87b5054042a70d8630f40a0f991c64c42786824f660245b943d2be'
             'bc8b1cee00a541eab44dab5bd23afddb99d9c667a5d4d083d7bf9575b321052c'
             '4b63dee5d287bb16a8e1a588ba24ccaeb91a4e0d2993bfeb9a1fb423bf08432d'
@@ -27,18 +27,16 @@ sha256sums_i686=('60e2f0005f60b01e10feb65941fa2ad6e919cde1d8004eaacca713a4cea0ee
 sha256sums_x86_64=('f1f13fbc548cd28bf41e9517ccb2e3564f4d9f893d174bfa20f7a61d18e954c5')
 sha256sums_armv7h=('b15c8ff43d09fa1d63aa63aa185a8a5b9f4ece02ebf67e9aa5152888d4a6be6b')
 sha256sums_aarch64=('024eb6da74f450a0f2715cc233573b714fdba14dbf9fd229ed1479bbd4e83ea6')
-
-depends=('wireguard-tools')
-conflicts=($_pkgname)
-provides=($_pkgname)
-install=$_pkgname.install
+depends=(bash wireguard-tools)
+conflicts=(${pkgname%-bin})
+provides=(${pkgname%-bin})
+install=${pkgname%-bin}.install
 
 package() {
-        install -d $pkgdir/{opt/$_pkgname,usr/lib/systemd/system,etc/sysctl.d}
-        install -Dm755 $_pkgname $pkgdir/opt/$_pkgname/$_pkgname
-        install -Dm644 $srcdir/$_pkgname.service ${pkgdir}/usr/lib/systemd/system/$_pkgname.service
-        install -Dm644 $srcdir/99-wg.conf ${pkgdir}/etc/sysctl.d/99-wg.conf
-        install -Dm755 $srcdir/wgiptables.sh ${pkgdir}/opt/$_pkgname/wgiptables
-        install -Dm644 $srcdir/wg-reload.path ${pkgdir}/usr/lib/systemd/system/wg-reload.path
-        install -Dm644 $srcdir/wg-reload.service ${pkgdir}/usr/lib/systemd/system/wg-reload.service
+  install -Dm644 LICENSE                            -t ${pkgdir}/usr/share/licenses/${pkgname%-bin}/
+  install -Dm755 ${pkgname%-bin}                    -t ${pkgdir}/opt/${pkgname%-bin}/
+  install -Dm644 ${srcdir}/${pkgname%-bin}.service  -t ${pkgdir}/usr/lib/systemd/system/
+  install -Dm644 ${srcdir}/99-wg.conf               -t ${pkgdir}/etc/sysctl.d/99-wg.conf
+  install -Dm755 ${srcdir}/wgiptables.sh               ${pkgdir}/opt/$_pkgname/wgiptables
+  install -Dm644 ${srcdir}/wg-reload.{path,service} -t ${pkgdir}/usr/lib/systemd/system/
 }