Update to 1.5 REACTIVE AMAR IS REQUIRED

5 files changed, 31 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fd43732234bb..ea459ea2b124 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = amar-installer
 	pkgdesc = Install AMAR repository
-	pkgver = 1.1
+	pkgver = 1.5
 	pkgrel = 1
 	url = https://www.tuxnvape.fr/
+	install = amar.install
 	arch = x86_64
 	license = GPL3
 	depends = gksu
@@ -11,9 +12,11 @@ pkgbase = amar-installer
 	source = amar.py
 	source = amar.png
 	source = amar.desktop
-	sha256sums = 2032a352c85fc9945bc0b3cb7fd5cde97b7eeb239cc2235e8fa3585029fe2af0
-	sha256sums = 7d55246c919c9e22f7cfdb0ba0b92a3e13dc87ca0414777cbece4c24c3380cd1
+	source = amar.conf
+	sha256sums = d54d10467391247f23c1ee07df0637c64378443847a7ec7ea9a9d5fe41f2f8d4
+	sha256sums = 874700067f446dff59f8e4e6c3b14519ca8afdf31742af629343c80002c71376
 	sha256sums = 0f2f75e7aaf1375b14570067563330f438e2a20158642b76c16a4ff4a8bb3158
+	sha256sums = d8fafeb25a8b2368803565ed62ba147aa38adfe57089fe44125f5e07eea3d21b
 
 pkgname = amar-installer
 
diff --git a/PKGBUILD b/PKGBUILD
index f8fb305aea5a..bcf1e13363bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,26 @@
 # Maintainer: Elrondo46 TuxnVape <elrond94@hotmail.com>
 
 pkgname=amar-installer
-pkgver=1.1
+pkgver=1.5
 pkgrel=1
 pkgdesc="Install AMAR repository"
 arch=('x86_64')
 license=('GPL3')
 url="https://www.tuxnvape.fr/"
 depends=('gksu' 'tk' 'python-pillow')
+install=amar.install
 source=("amar.py"
         "amar.png"
-        "amar.desktop")
-sha256sums=('7d55246c919c9e22f7cfdb0ba0b92a3e13dc87ca0414777cbece4c24c3380cd1'
+        "amar.desktop"
+        "amar.conf")
+sha256sums=('d54d10467391247f23c1ee07df0637c64378443847a7ec7ea9a9d5fe41f2f8d4'
             '874700067f446dff59f8e4e6c3b14519ca8afdf31742af629343c80002c71376'
-            '0f2f75e7aaf1375b14570067563330f438e2a20158642b76c16a4ff4a8bb3158')
-
+            '0f2f75e7aaf1375b14570067563330f438e2a20158642b76c16a4ff4a8bb3158'
+            'd8fafeb25a8b2368803565ed62ba147aa38adfe57089fe44125f5e07eea3d21b')		
 package() {
 	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"
 } 
 
diff --git a/amar.conf b/amar.conf
new file mode 100644
index 000000000000..6f7ad80e5f29
--- /dev/null
+++ b/amar.conf
@@ -0,0 +1,4 @@
+[AMAR]
+SigLevel=Never
+Server=https://amar.roro-home.fr/AMAR/x86_64/
+
diff --git a/amar.install b/amar.install
new file mode 100755
index 000000000000..cbfd47076ee9
--- /dev/null
+++ b/amar.install
@@ -0,0 +1,10 @@
+post_install() {
+  echo "YOU HAVE TO REENABLE AMAR AFTER THIS UPGRADE"
+  sed -i -e '/^#Do not disable AMAR/,+3d' /etc/pacman.conf 
+}
+
+post_upgrade() {
+  post_install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/amar.py b/amar.py
index c2d797fc5045..4647b95316c6 100644
--- a/amar.py
+++ b/amar.py
@@ -33,14 +33,14 @@ try:
     with open(pacmanfichier, 'r') as searchfile:
         for line in searchfile:
             #Si la chaîne '[AMAR]' est écrit quelque part dans pacman.conf, alors le dépôt est activé et on met etatamar = 1.
-            if '[AMAR]' in line:
+            if 'amar.conf' in line:
                 etatamar = 1
     searchfile.close()
 except OSError:
     print("pacman.conf non acessible, donnez le chemin vers votre fichier")
     sys.exit(1)
 
-configamar = "\n#Do not disable AMAR manually if you use the app\n[AMAR]\nSigLevel = Never\nServer = https://amar.lagout.org/x86_64/\n"
+configamar = "\n#Do not disable AMAR manually if you use the app\nInclude = /etc/pacman.d/amar.conf\n"
 
 def pressA():
     A.config(state=DISABLED)
@@ -65,9 +65,7 @@ def pressB():
         with open((pacmanfichier), "r") as f:
             lines = f.readlines()
             lines.remove("#Do not disable AMAR manually if you use the app\n")
-            lines.remove("[AMAR]\n")
-            lines.remove("SigLevel = Never\n")
-            lines.remove("Server = https://amar.lagout.org/x86_64/\n")
+            lines.remove("Include = /etc/pacman.d/amar.conf\n")
         with open((pacmanfichier), "w") as new_f:
             for line in lines:
                 new_f.write(line)