Enhance code

3 files changed, 19 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7717319118c5..bbc9205358db 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = amar-installer
 	pkgdesc = Install AMAR repository
-	pkgver = 1.9.10.fb
+	pkgver = 1.9.11.fb
 	pkgrel = 1
 	url = https://www.tuxnvape.fr/
 	install = amar.install
@@ -15,7 +15,7 @@ pkgbase = amar-installer
 	source = amar.glade
 	source = amarban.png
 	source = org.tnv.amar.policy
-	sha256sums = 0408fb3f25f792917eef5d57ff2f44819f624ba43963a2d905acbe3793fc80b4
+	sha256sums = 7183315ded7ab7af4923ac42e8777268692d308590bd18a73bf72ee98989fc0b
 	sha256sums = 874700067f446dff59f8e4e6c3b14519ca8afdf31742af629343c80002c71376
 	sha256sums = c5dbfca766050bdbfd36866c1f479ca8039aae80fa8b2847b376c05087d1364c
 	sha256sums = d8fafeb25a8b2368803565ed62ba147aa38adfe57089fe44125f5e07eea3d21b
diff --git a/PKGBUILD b/PKGBUILD
index 4f815c0581c2..9db75f26a6fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Elrondo46 TuxnVape <elrond94@hotmail.com>
 
 pkgname=amar-installer
-pkgver=1.9.10.fb
+pkgver=1.9.11.fb
 pkgrel=1
 pkgdesc="Install AMAR repository"
 arch=('x86_64')
@@ -17,13 +17,14 @@ source=("amar.py"
 		"amarban.png"
 	"org.tnv.amar.policy")
 
-sha256sums=('0408fb3f25f792917eef5d57ff2f44819f624ba43963a2d905acbe3793fc80b4'
+sha256sums=('7183315ded7ab7af4923ac42e8777268692d308590bd18a73bf72ee98989fc0b'
             '874700067f446dff59f8e4e6c3b14519ca8afdf31742af629343c80002c71376'
             'c5dbfca766050bdbfd36866c1f479ca8039aae80fa8b2847b376c05087d1364c'
             'd8fafeb25a8b2368803565ed62ba147aa38adfe57089fe44125f5e07eea3d21b'
             'a46c4d4a5b2c8c41f2273d3d6c33d4f36f160e9dc820b929db082ed2414ed02b'
             '2edefaa6f3143bc2ac3f6a11d069d2a72fc968e492f8e96a2a7e2c9423a4237a'
             'dcf05a9d8c5cfe2cc23523eaab9bbd30932b3d2c68ad8d38edbdcad372053920')
+
 package() {
         install -Dm644 "amar.desktop" "${pkgdir}/usr/share/applications/amar.desktop"
         install -Dm644 "amar.py" "${pkgdir}/usr/bin/amar.py"
diff --git a/amar.py b/amar.py
index 01d541b7eda9..d4ef9ff0bf9d 100644
--- a/amar.py
+++ b/amar.py
@@ -1,8 +1,8 @@
 #!/usr/bin/python
-#Created by Baoréla alias..... SOON
-#Old parts of code Fredo, Rhylx, Francky, hRF, Pepito
+# Created by Baba Orhum
+# NO MORE THIRD PARTS OF CODE SPECIAL THANKS FOR MORAL SUPPORT OF TUXNVAPE
+# AND MY DEVEL TEACHER WASCAR
 
-import sys
 import os
 import gi
 from threading import Thread
@@ -21,7 +21,6 @@ class Handler:
         thread.daemon = True
         thread.start()
 
-
 amarpath = "/usr/share/amar/amar.glade"
 builder = Gtk.Builder()
 builder.add_from_file(amarpath)
@@ -32,6 +31,14 @@ os.system("xrdb -load /dev/null")
 pacmanfichier = "/etc/pacman.conf"
 buttonactive = builder.get_object("buttonActive")
 
+def errorButtons():
+    dialog = Gtk.MessageDialog(parent=Gtk.Window(), flags=0, message_type=Gtk.MessageType.ERROR,
+                               buttons=Gtk.ButtonsType.OK, text="FATAL")
+    dialog.format_secondary_text("Erreur dans l'execution vérifiez les permissions")
+    dialog.run()
+    dialog.destroy()
+    Gtk.main_quit()
+
 try:
     etatamar = 0
     searchfile = open(pacmanfichier, "r")
@@ -41,21 +48,15 @@ try:
     searchfile.close()
 
 except OSError:
-    print("pacman.conf non acessible, donnez le chemin vers votre fichier")
-    sys.exit(1)
+    errorButtons()
 
 if etatamar == 1:
     buttonactive.set_label('DESACTIVER')
 else:
     buttonactive.set_label('ACTIVER')
 
-
 configamar = "\n#Do not disable AMAR manually if you use the app\nInclude = /etc/pacman.d/amar.conf\n"
 
-def errorButtons():
-
-    print("bad")
-
 def success1():
     buttonactive.set_sensitive(True)
     buttonactive.set_label('DESACTIVER')
@@ -76,7 +77,7 @@ def pressActive():
                 ecrire.close()
                 GLib.idle_add(success1)
         except OSError:
-             errorButtons()
+            GLib.idle_add(errorButtons)
     else:
         try:
             with open((pacmanfichier), "r") as f:
@@ -92,12 +93,8 @@ def pressActive():
             new_f.close()
             GLib.idle_add(success2)
         except OSError:
-            errorButtons()
-
+            GLib.idle_add(errorButtons)
 
-
-print(etatamar)
 window = builder.get_object("mainWindow")
 window.show_all()
-
 Gtk.main()