Switch to polkit

5 files changed, 46 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a5ff8c763423..96d5b0ddad38 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,23 @@
 pkgbase = amar-installer
 	pkgdesc = Install AMAR repository
-	pkgver = 1.5
-	pkgrel = 2
+	pkgver = 1.7
+	pkgrel = 3
 	url = https://www.tuxnvape.fr/
 	install = amar.install
 	arch = x86_64
 	license = GPL3
-	depends = gksu
 	depends = tk
 	depends = python-pillow
 	source = amar.py
 	source = amar.png
 	source = amar.desktop
 	source = amar.conf
-	sha256sums = d54d10467391247f23c1ee07df0637c64378443847a7ec7ea9a9d5fe41f2f8d4
+	source = org.tnv.amar.policy
+	sha256sums = f092667c42b6da2b5a4d8defb031c7d4be1f8560b1b7cfdd9af757ce9eb737b1
 	sha256sums = 874700067f446dff59f8e4e6c3b14519ca8afdf31742af629343c80002c71376
-	sha256sums = 0f2f75e7aaf1375b14570067563330f438e2a20158642b76c16a4ff4a8bb3158
+	sha256sums = c5dbfca766050bdbfd36866c1f479ca8039aae80fa8b2847b376c05087d1364c
 	sha256sums = d8fafeb25a8b2368803565ed62ba147aa38adfe57089fe44125f5e07eea3d21b
+	sha256sums = dcf05a9d8c5cfe2cc23523eaab9bbd30932b3d2c68ad8d38edbdcad372053920
 
 pkgname = amar-installer
 
diff --git a/PKGBUILD b/PKGBUILD
index 7a5d8e3e4979..f67e25fbce84 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,31 @@
 # Maintainer: Elrondo46 TuxnVape <elrond94@hotmail.com>
 
 pkgname=amar-installer
-pkgver=1.5
-pkgrel=2
+pkgver=1.7
+pkgrel=3
 pkgdesc="Install AMAR repository"
 arch=('x86_64')
 license=('GPL3')
 url="https://www.tuxnvape.fr/"
-depends=('gksu' 'tk' 'python-pillow')
+depends=('tk' 'python-pillow')
 install=amar.install
 source=("amar.py"
         "amar.png"
         "amar.desktop"
-        "amar.conf")
-sha256sums=('d54d10467391247f23c1ee07df0637c64378443847a7ec7ea9a9d5fe41f2f8d4'
+        "amar.conf"
+	"org.tnv.amar.policy")
+
+sha256sums=('f092667c42b6da2b5a4d8defb031c7d4be1f8560b1b7cfdd9af757ce9eb737b1'
             '874700067f446dff59f8e4e6c3b14519ca8afdf31742af629343c80002c71376'
-            '0f2f75e7aaf1375b14570067563330f438e2a20158642b76c16a4ff4a8bb3158'
-            'd8fafeb25a8b2368803565ed62ba147aa38adfe57089fe44125f5e07eea3d21b')		
+            'c5dbfca766050bdbfd36866c1f479ca8039aae80fa8b2847b376c05087d1364c'
+            'd8fafeb25a8b2368803565ed62ba147aa38adfe57089fe44125f5e07eea3d21b'
+            'dcf05a9d8c5cfe2cc23523eaab9bbd30932b3d2c68ad8d38edbdcad372053920')		
+
 package() {
-	install -Dm644 "amar.desktop" "${pkgdir}/usr/share/applications/amar.desktop"
+        install -Dm644 "amar.desktop" "${pkgdir}/usr/share/applications/amar.desktop"
         install -Dm644 "amar.py" "${pkgdir}/usr/bin/amar.py"
         install -Dm644 "amar.png" "${pkgdir}/usr/share/icons/amar.png"
         install -Dm644 "amar.conf" "${pkgdir}/etc/pacman.d/amar.conf"
+        install -Dm644 "org.tnv.amar.policy" "${pkgdir}/usr/share/polkit-1/actions/org.tnv.amar.policy"
 } 
 
diff --git a/amar.desktop b/amar.desktop
index f630754bb45b..e9f2f7d3d235 100644
--- a/amar.desktop
+++ b/amar.desktop
@@ -4,7 +4,7 @@ Name=Amar Installer
 Type=Application
 Comment=Install AMAR
 Terminal=false
-Exec=python /usr/bin/amar.py
+Exec=pkexec /usr/bin/python /usr/bin/amar.py
 Icon=amar
 StartupNotify=true
 Categories=System;
diff --git a/amar.py b/amar.py
index 4647b95316c6..195d81f83db6 100644
--- a/amar.py
+++ b/amar.py
@@ -21,7 +21,7 @@ else:
     import tkMessageBox as messagebox
 
 if os.getuid() != 0:
-    os.system ("gksudo python /usr/bin/amar.py")
+    os.system ("sudo -H python /usr/bin/amar.py")
     #print("Utiliser le script en tant qu'administrateur, lancer le avec 'gksudo -s python amar.py'")
     sys.exit(1)
 
diff --git a/org.tnv.amar.policy b/org.tnv.amar.policy
new file mode 100644
index 000000000000..66465629433f
--- /dev/null
+++ b/org.tnv.amar.policy
@@ -0,0 +1,25 @@
+<?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>
+
+ <vendor>Amar Installer</vendor>
+ <vendor_url>http://www.tuxnvape.fr</vendor_url>
+
+ <action id="org.tnv.amar.pkexec.run">
+    <description>Run amar installer</description>
+    <description xml:lang="fr">Lancement de l'installateur AMAR en root</description>
+    <message>Admin right are required to launch Installer of the additionnal TuxnVape AMAR repository</message>
+    <message xml:lang="fr">Les droits d'administration sont nécessaires pour lancer l’application d'installation du dépot tiers TuxnVape AMAR </message>
+    <icon_name>pamac</icon_name>
+    <defaults>
+     <allow_any>no</allow_any>
+     <allow_inactive>no</allow_inactive>
+     <allow_active>auth_admin_keep</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/python</annotate>
+    <annotate key="org.freedesktop.policykit.exec.argv1">/usr/bin/amar.py</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+ </action>
+</policyconfig>