Re-write .PKGBUILD

2 files changed, 15 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d95a8acbe8bd..369e5720236f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = airvpn-bin
 	pkgdesc = AirVPN client "Eddie", stable version. Based on OpenVPN and operated by activists and hacktivists in defense of net neutrality, privacy and against censorship.
 	pkgver = 2.9.2
-	pkgrel = 2
+	pkgrel = 3
 	url = https://airvpn.org/linux/
 	install = airvpn.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 213ea37c4698..4793a9b0c5e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,7 @@
 
 pkgname=airvpn-bin
 pkgver=2.9.2
-_version=${pkgver%.*}
-pkgrel=2
+pkgrel=3
 pkgdesc='AirVPN client "Eddie", stable version. Based on OpenVPN and operated by activists and hacktivists
 in defense of net neutrality, privacy and against censorship.'
 arch=('i686' 'x86_64')
@@ -13,8 +12,8 @@ depends=(gksu mono openvpn stunnel)
 provides=('airvpn')
 conflicts=('airvpn' 'airvpn-beta-bin')
 install=airvpn.install
-source_i686=("https://airvpn.org/repository/${_version}/airvpn_linux_x86_debian.deb")
-source_x86_64=("https://airvpn.org/repository/${_version}/airvpn_linux_x64_debian.deb")
+source_i686=("https://airvpn.org/repository/${pkgver%.*}/airvpn_linux_x86_debian.deb")
+source_x86_64=("https://airvpn.org/repository/${pkgver%.*}/airvpn_linux_x64_debian.deb")
 md5sums_i686=('c3f1ed16b8e72b530c5786799bb13b89')
 md5sums_x86_64=('edceba29c0ca6b58eb36478e12c2f71c')
 sha256sums_i686=('8dcae5773fda5f0955dcbd19a2364ac700909b8ae3f564de298a9add5879575a')
@@ -25,6 +24,15 @@ package() {
   bsdtar -xf data.tar.gz
 
   msg2 "Moving stuff in place..."
-  chmod -R g-w usr
-  mv usr "${pkgdir}"
+  install -Dm755 "$srcdir/usr/lib/AirVPN/AirVPN.exe" "$pkgdir/usr/lib/AirVPN"
+  install -Dm644 "$srcdir/usr/lib/AirVPN/Lib.Core.dll" "$pkgdir/usr/lib/AirVPN"
+  install -Dm644 "$srcdir/usr/lib/AirVPN/Lib.Forms.dll" "$pkgdir/usr/lib/AirVPN"
+  install -Dm644 "$srcdir/usr/lib/AirVPN/Platforms.Linux.dll" "$pkgdir/usr/lib/AirVPN"
+  install -Dm755 "$srcdir/usr/lib/AirVPN/update-resolv-conf" "$pkgdir/usr/lib/AirVPN"
+  install -Dm755 "$srcdir/usr/bin/airvpn" "$pkgdir/usr/bin"
+  install -Dm644 "$srcdir/usr/share/doc/airvpn/changelog.gz" "$pkgdir/usr/share/doc/airvpnchangelog.gz"
+  install -Dm644 "$srcdir/usr/share/doc/airvpn/copyright" "$pkgdir/usr/share/doc/copyright"
+  install -Dm644 "$srcdir/usr/share/man/man1/airvpn.1.gz" "$pkgdir/usr/share/man/man1/airvpn.1.gz"
+  cd "$srcdir/usr/share/applications"
+  desktop-file-install -m 644 --add-category=KDE --dir "$pkgdir/usr/share/applications/" "AirVPN.desktop"
 }