summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorElrondo462018-05-04 14:51:16 +0200
committerElrondo462018-05-04 14:51:16 +0200
commitcef41ab0d8cf94ad15ffb8405526a4cee48e4a4c (patch)
treeb2c023b43bbcf9a94661ebfb712118d3fa94e08e
parent097833a7105236b111b163bedafcd5f5cf451c54 (diff)
downloadaur-cef41ab0d8cf94ad15ffb8405526a4cee48e4a4c.tar.gz
refix python script
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rwxr-xr-xamar.install3
-rw-r--r--amar.py11
4 files changed, 6 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 25b70e12a239..cad63cd0ac96 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = amar-installer
pkgdesc = Install AMAR repository
- pkgver = 1.7.1
+ pkgver = 1.7.2
pkgrel = 1
url = https://www.tuxnvape.fr/
install = amar.install
@@ -13,7 +13,7 @@ pkgbase = amar-installer
source = amar.desktop
source = amar.conf
source = org.tnv.amar.policy
- sha256sums = 3150e6b7721a6e63a2c7356e0b0babb5ab426b7aeaed09fdfb46b5ff51ea62cb
+ sha256sums = 4fe1b85883adcccccf05e30756d68c60859db18ec760d22f8ea24d78690a4496
sha256sums = 874700067f446dff59f8e4e6c3b14519ca8afdf31742af629343c80002c71376
sha256sums = c5dbfca766050bdbfd36866c1f479ca8039aae80fa8b2847b376c05087d1364c
sha256sums = d8fafeb25a8b2368803565ed62ba147aa38adfe57089fe44125f5e07eea3d21b
diff --git a/PKGBUILD b/PKGBUILD
index ed7c18ba4eda..20b4577e8880 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Elrondo46 TuxnVape <elrond94@hotmail.com>
pkgname=amar-installer
-pkgver=1.7.1
+pkgver=1.7.2
pkgrel=1
pkgdesc="Install AMAR repository"
arch=('x86_64')
@@ -15,7 +15,7 @@ source=("amar.py"
"amar.conf"
"org.tnv.amar.policy")
-sha256sums=('3150e6b7721a6e63a2c7356e0b0babb5ab426b7aeaed09fdfb46b5ff51ea62cb'
+sha256sums=('4fe1b85883adcccccf05e30756d68c60859db18ec760d22f8ea24d78690a4496'
'874700067f446dff59f8e4e6c3b14519ca8afdf31742af629343c80002c71376'
'c5dbfca766050bdbfd36866c1f479ca8039aae80fa8b2847b376c05087d1364c'
'd8fafeb25a8b2368803565ed62ba147aa38adfe57089fe44125f5e07eea3d21b'
diff --git a/amar.install b/amar.install
index 275421b67d0e..f96fc3da0ed0 100755
--- a/amar.install
+++ b/amar.install
@@ -1,6 +1,5 @@
post_install() {
- rm /var/lib/pacman/db.lck
- pacman -Syy
+exit 0
}
post_upgrade() {
diff --git a/amar.py b/amar.py
index 2c6c8fd1cbb8..46586a8c46b1 100644
--- a/amar.py
+++ b/amar.py
@@ -20,16 +20,7 @@ if sys.version_info[0] == 3:
else:
import tkMessageBox as messagebox
-if os.getuid() != 0:
- #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)
+os.system("xrdb -load /dev/null") #chargement des données avec xrdb
pacmanfichier = "/etc/pacman.conf"