Update source address, fix KDE install

2 files changed, 10 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c5d19a263f5c..d8be083593c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Thu Jun 23 06:24:53 UTC 2016
+# Tue Nov  1 08:53:49 UTC 2016
 pkgbase = airvpn-bin
 	pkgdesc = AirVPN client "Eddie" based on OpenVPN, stable version.
 	pkgver = 2.10.3
@@ -17,10 +17,10 @@ pkgbase = airvpn-bin
 	provides = airvpn
 	conflicts = airvpn
 	conflicts = airvpn-beta-bin
-	source_i686 = https://airvpn.org/repository/2.10/airvpn_linux_x86_debian.deb
+	source_i686 = airvpn_linux_x86_debian_2.10.3.deb::https://airvpn.org/eddie/download/?platform=linux&arch=x86&ui=ui&format=debian.deb&version=2.10
 	md5sums_i686 = 0138d03df3f14c2103720b30f00f4400
 	sha256sums_i686 = bdf64987d98558b499bdf2ce5518a7d8ade63b975323bafe903d03d53050f539
-	source_x86_64 = https://airvpn.org/repository/2.10/airvpn_linux_x64_debian.deb
+	source_x86_64 = airvpn_linux_x64_debian_2.10.3.deb::https://airvpn.org/eddie/download/?platform=linux&arch=x64&ui=ui&format=debian.deb&version=2.10
 	md5sums_x86_64 = 796a053cb937e50a656cde65f6dc1968
 	sha256sums_x86_64 = af028728cf551edfce6525d5fd05bc356440ad5f23bf344865b3a69974006a3b
 
diff --git a/PKGBUILD b/PKGBUILD
index e44676b3b7dd..a4ed609c020f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,8 +12,8 @@ optdepends=('stunnel: VPN over SSL' 'openssh: VPN over SSH')
 provides=('airvpn')
 conflicts=('airvpn' 'airvpn-beta-bin')
 install=airvpn.install
-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")
+source_i686=("airvpn_linux_x86_debian_${pkgver}.deb::https://airvpn.org/eddie/download/?platform=linux&arch=x86&ui=ui&format=debian.deb&version=${pkgver%.*}")
+source_x86_64=("airvpn_linux_x64_debian_${pkgver}.deb::https://airvpn.org/eddie/download/?platform=linux&arch=x64&ui=ui&format=debian.deb&version=${pkgver%.*}")
 md5sums_i686=('0138d03df3f14c2103720b30f00f4400')
 md5sums_x86_64=('796a053cb937e50a656cde65f6dc1968')
 sha256sums_i686=('bdf64987d98558b499bdf2ce5518a7d8ade63b975323bafe903d03d53050f539')
@@ -34,17 +34,18 @@ package() {
   install -Dm644 "$srcdir/usr/share/doc/airvpn/copyright" "$pkgdir/usr/share/doc/airvpn/copyright"
   install -Dm644 "$srcdir/usr/share/man/man1/airvpn.1.gz" "$pkgdir/usr/share/man/man1/airvpn.1.gz"
   ## Fix .desktop file for KDE
-  if [ -f "/usr/bin/dolphin" ]; then
+  _desktop_session=$(printf "%s" "$DESKTOP_SESSION" | awk -F "/" '{print $NF}')
+  if [ "$_desktop_session" = "plasma" ]; then
     msg2 "Installing desktop file for KDE..."
     install -Dm644 "$srcdir/usr/share/pixmaps/AirVPN.png"  "$pkgdir/usr/share/pixmaps/airvpn.png"
     cp "$srcdir/usr/share/applications/AirVPN.desktop" "$srcdir/airvpn.desktop"
-    desktop-file-install -m 644 --set-comment="VPN service based on OpenVPN"\
-    --dir="$pkgdir/usr/share/applications/" --add-category="Qt;KDE"\
+    desktop-file-install -m 644 --set-comment="VPN service based on OpenVPN" \
+    --dir="$pkgdir/usr/share/applications/" \
     --set-icon="/usr/share/pixmaps/airvpn.png" "airvpn.desktop"
   else
   msg2 "Installing desktop file..."
   install -Dm644 "$srcdir/usr/share/pixmaps/AirVPN.png"  "$pkgdir/usr/share/pixmaps/AirVPN.png"
-  desktop-file-install -m 644 --set-comment="VPN service based on OpenVPN"\
+  desktop-file-install -m 644 --set-comment="VPN service based on OpenVPN" \
   --dir="$pkgdir/usr/share/applications/" "$srcdir/usr/share/applications/AirVPN.desktop"
   fi
 }