fix python script

3 files changed, 17 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 96d5b0ddad38..25b70e12a239 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = amar-installer
 	pkgdesc = Install AMAR repository
-	pkgver = 1.7
-	pkgrel = 3
+	pkgver = 1.7.1
+	pkgrel = 1
 	url = https://www.tuxnvape.fr/
 	install = amar.install
 	arch = x86_64
@@ -13,7 +13,7 @@ pkgbase = amar-installer
 	source = amar.desktop
 	source = amar.conf
 	source = org.tnv.amar.policy
-	sha256sums = f092667c42b6da2b5a4d8defb031c7d4be1f8560b1b7cfdd9af757ce9eb737b1
+	sha256sums = 3150e6b7721a6e63a2c7356e0b0babb5ab426b7aeaed09fdfb46b5ff51ea62cb
 	sha256sums = 874700067f446dff59f8e4e6c3b14519ca8afdf31742af629343c80002c71376
 	sha256sums = c5dbfca766050bdbfd36866c1f479ca8039aae80fa8b2847b376c05087d1364c
 	sha256sums = d8fafeb25a8b2368803565ed62ba147aa38adfe57089fe44125f5e07eea3d21b
diff --git a/PKGBUILD b/PKGBUILD
index f67e25fbce84..ed7c18ba4eda 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Elrondo46 TuxnVape <elrond94@hotmail.com>
 
 pkgname=amar-installer
-pkgver=1.7
-pkgrel=3
+pkgver=1.7.1
+pkgrel=1
 pkgdesc="Install AMAR repository"
 arch=('x86_64')
 license=('GPL3')
@@ -15,7 +15,7 @@ source=("amar.py"
         "amar.conf"
 	"org.tnv.amar.policy")
 
-sha256sums=('f092667c42b6da2b5a4d8defb031c7d4be1f8560b1b7cfdd9af757ce9eb737b1'
+sha256sums=('3150e6b7721a6e63a2c7356e0b0babb5ab426b7aeaed09fdfb46b5ff51ea62cb'
             '874700067f446dff59f8e4e6c3b14519ca8afdf31742af629343c80002c71376'
             'c5dbfca766050bdbfd36866c1f479ca8039aae80fa8b2847b376c05087d1364c'
             'd8fafeb25a8b2368803565ed62ba147aa38adfe57089fe44125f5e07eea3d21b'
diff --git a/amar.py b/amar.py
index 195d81f83db6..2c6c8fd1cbb8 100644
--- a/amar.py
+++ b/amar.py
@@ -11,7 +11,7 @@ gksudo -s python amar.py
 
 import os
 import sys
-from PIL import Image 
+from PIL import Image
 import subprocess
 from tkinter import *
 
@@ -21,9 +21,15 @@ else:
     import tkMessageBox as messagebox
 
 if os.getuid() != 0:
-    os.system ("sudo -H python /usr/bin/amar.py")
+	#correction de l'erreur de lancement
+	os.system("xrdb -all -query|sed -e 's#[A-Z_]*BACKGROUND# gray90#' \
+				-e 's#[A-Z_]*FOREGROUND# Black#' \
+				-e 's#[A-Z_]*HIGHLIGHT# White#' \
+				-e 's#[A-Z_]*LOWLIGHT# Black#'|xrdb -merge")
+    
+    #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)
+    #sys.exit(1)
 
 pacmanfichier = "/etc/pacman.conf"
 
@@ -57,7 +63,7 @@ def pressA():
         messagebox.showerror("Erreur", "Ficher pacman.conf non accessible en écrture\nVérifier vos droit et relancer"
                                        " le script\nVérifier aussi que vous ne faite une mise à jours en même temps")
 
- 
+
 def pressB():
     A.config(state=ACTIVE)
     B.config(state=DISABLED)
@@ -118,5 +124,5 @@ if etatamar == 0:
     INFO.config(text="Inactif", fg="red")  # on active le depot AMAR, donc on ecrit sur le fichier.
 else:
     INFO.config(text="Actif", fg="green")  # on active le depot AMAR, donc on ecrit sur le fichier.
-    
+
 win.mainloop()