Added desktop launcher for manager and polkit policies

8 files changed, 96 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a9689c4239a7..4e9f08d68805 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Feb 10 17:51:42 UTC 2016
+# Wed Feb 10 18:38:16 UTC 2016
 pkgbase = xampp
 	pkgdesc = A free and open source cross-platform web server package (LAMP Stack), consisting mainly of the Apache HTTP Server, MySQL database, and interpreters for scripts written in the PHP and Perl programming languages
 	pkgver = 5.6.15
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.apachefriends.org/
 	install = xampp.install
 	arch = i686
@@ -11,6 +11,7 @@ pkgbase = xampp
 	license = GPL
 	makedepends = proot-bin
 	depends = net-tools
+	optdepends = polkit: to run XAMPP Manager from menu
 	options = !strip
 
 pkgname = xampp
diff --git a/PKGBUILD b/PKGBUILD
index f57c1efe4ed0..81032003f082 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,19 +3,28 @@
 # Contributor: Thiago Perrotta <echo dGhpYWdvcGVycm90dGE5NUBnbWFpbC5jb20K | base64 -d >
 pkgname=xampp
 pkgver=5.6.15
-pkgrel=2
+pkgrel=3
 pkgdesc="A free and open source cross-platform web server package (LAMP Stack), consisting mainly of the Apache HTTP Server, MySQL database, and interpreters for scripts written in the PHP and Perl programming languages"
 url="http://www.apachefriends.org/"
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('net-tools')
+optdepends=('polkit: to run XAMPP Manager from menu')
 makedepends=('proot-bin')
-[ "$CARCH" = "i686" ] && source=("xampp-installer"::"https://www.apachefriends.org/xampp-files/${pkgver}/${pkgname}-linux-${pkgver}-1-installer.run" "lampp.service")
-[ "$CARCH" = "x86_64" ] && source=("xampp-installer"::"https://www.apachefriends.org/xampp-files/${pkgver}/${pkgname}-linux-x64-${pkgver}-1-installer.run" "lampp.service")
+source_i686=( "xampp-installer"::"https://www.apachefriends.org/xampp-files/${pkgver}/${pkgname}-linux-${pkgver}-1-installer.run"
+              "org.freedesktop.xampp-manager.policy"
+              "xampp-manager_polkit")
+source_x86_64=( "xampp-installer"::"https://www.apachefriends.org/xampp-files/${pkgver}/${pkgname}-linux-x64-${pkgver}-1-installer.run"
+                "org.freedesktop.xampp-manager-x64.policy"
+                "xampp-manager-x64_polkit")
+source=("lampp.service" "xampp-manager.desktop" "xampp-manager.png")
 options=(!strip)
 install=xampp.install
-[ "$CARCH" = "i686" ] && md5sums=('23ab874b81cc1db6cf33e5d87e64ee35' 'db1881f9564f18ed34d877035c28a4b8')
-[ "$CARCH" = "x86_64" ] && md5sums=('15a591f524051c1fdeefff5a1689dd74' 'db1881f9564f18ed34d877035c28a4b8')
+md5sums_i686=('23ab874b81cc1db6cf33e5d87e64ee35' '5732030b36a892696016481279706808'
+              'bf75b016a5ce2deff1da3301013766cb')
+md5sums_x86_64=('15a591f524051c1fdeefff5a1689dd74' 'ba7853fd8b3125b0a783753ca5e23447'
+                '9d246102ea20f27a13d119e57741ce7d')
+md5sums=( 'db1881f9564f18ed34d877035c28a4b8' 'cbf909c2c3ad89470463eed2ce003f97' 'f214711d95b8135f16974e36128f3a68')
 
 package() {
   install -dm755 "${pkgdir}/opt/lampp"
@@ -25,7 +34,7 @@ package() {
   echo "Y" | proot -b "${pkgdir}/opt/lampp:/opt/lampp" "${srcdir}/xampp-installer" --mode text
   chmod g-s -R "${pkgdir}"/opt/lampp
 
-  # licenses
+  # Licenses
   install -dm755 "${pkgdir}"/usr/share/licenses/xampp
   cp "${pkgdir}"/opt/lampp/licenses/* "${pkgdir}"/usr/share/licenses/xampp
 
@@ -33,8 +42,20 @@ package() {
   install -dm755 "${pkgdir}"/usr/bin
   ln -sf /opt/lampp/lampp "${pkgdir}"/usr/bin/xampp
   ln -sf /opt/lampp/lampp "${pkgdir}"/usr/bin/lampp
+  [ "$CARCH" = "i686" ] && install -Dm755 "${srcdir}/xampp-manager_polkit" "${pkgdir}/usr/bin/xampp-manager_polkit"
+  [ "$CARCH" = "x86_64" ] && install -Dm755 "${srcdir}/xampp-manager-x64_polkit" "${pkgdir}/usr/bin/xampp-manager_polkit"
+
+
+  # Systemd service
+  mkdir -p ${pkgdir}/etc/systemd/system
+  cp ${srcdir}/lampp.service ${pkgdir}/etc/systemd/system
+
+  # Desktop launcher
+  install -Dm755 "${srcdir}/xampp-manager.png" "${pkgdir}/usr/share/pixmaps/xampp-manager.png"
+	install -Dm755 "${srcdir}/xampp-manager.desktop" "${pkgdir}/usr/share/applications/xampp-manager.desktop"
+
+  # Install policy file for desktop launcher
+  [ "$CARCH" = "i686" ] && install -Dm644 "${srcdir}/org.freedesktop.xampp-manager.policy" "${pkgdir}/usr/share/polkit-1/actions/org.freedesktop.xampp-manager.policy"
+  [ "$CARCH" = "x86_64" ] && install -Dm644 "${srcdir}/org.freedesktop.xampp-manager-x64.policy" "${pkgdir}/usr/share/polkit-1/actions/org.freedesktop.xampp-manager-x64.policy"
 
-  # systemd service
-  mkdir -p $pkgdir/etc/systemd/system
-  cp $srcdir/lampp.service $pkgdir/etc/systemd/system
 }
diff --git a/org.freedesktop.xampp-manager-x64.policy b/org.freedesktop.xampp-manager-x64.policy
new file mode 100644
index 000000000000..e9f0a65ce9fb
--- /dev/null
+++ b/org.freedesktop.xampp-manager-x64.policy
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+
+<policyconfig>
+
+  <action id="org.freedesktop.policykit.pkexec.xamp-manager-x64">
+    <description>Run XAMPP Manager</description>
+    <message>Authentication is required to run XAMPP Manager</message>
+    <defaults>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/opt/lampp/manager-linux-x64.run</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">TRUE</annotate>
+  </action>
+
+</policyconfig>
diff --git a/org.freedesktop.xampp-manager.policy b/org.freedesktop.xampp-manager.policy
new file mode 100644
index 000000000000..9d027f53cc01
--- /dev/null
+++ b/org.freedesktop.xampp-manager.policy
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+
+<policyconfig>
+
+  <action id="org.freedesktop.xampp-manager">
+    <description>Run XAMPP Manager</description>
+    <message>Authentication is required to run XAMPP Manager</message>
+    <defaults>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/opt/lampp/manager-linux.run</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">TRUE</annotate>
+  </action>
+
+</policyconfig>
diff --git a/xampp-manager-x64_polkit b/xampp-manager-x64_polkit
new file mode 100644
index 000000000000..7843b4e7a788
--- /dev/null
+++ b/xampp-manager-x64_polkit
@@ -0,0 +1,6 @@
+#!/bin/bash
+if [ $(which pkexec) ]; then
+	pkexec "/opt/lampp/manager-linux-x64.run" "$@"
+else
+	/opt/lampp/manager-linux-x64.run "$@"
+fi
diff --git a/xampp-manager.desktop b/xampp-manager.desktop
new file mode 100644
index 000000000000..17458840cb72
--- /dev/null
+++ b/xampp-manager.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=XAMPP Manager
+Comment=XAMPP server manager
+Exec=/usr/bin/xampp-manager_polkit
+StartupWMClass=XAMPP
+Icon=xampp-manager
+Terminal=false
+Type=Application
+Categories=Network;
diff --git a/xampp-manager.png b/xampp-manager.png
new file mode 100644
index 000000000000..864fd5436661
--- /dev/null
+++ b/xampp-manager.png
diff --git a/xampp-manager_polkit b/xampp-manager_polkit
new file mode 100644
index 000000000000..62367f5e47de
--- /dev/null
+++ b/xampp-manager_polkit
@@ -0,0 +1,6 @@
+#!/bin/bash
+if [ $(which pkexec) ]; then
+	pkexec "/opt/lampp/manager-linux.run" "$@"
+else
+	/opt/lampp/manager-linux-x64.run "$@"
+fi