diff options
| -rw-r--r-- | .SRCINFO | 20 | ||||
| -rw-r--r-- | PKGBUILD | 28 | ||||
| -rw-r--r-- | amar.conf | 4 | ||||
| -rw-r--r-- | amar.desktop | 12 | ||||
| -rw-r--r-- | amar.glade | 221 | ||||
| -rwxr-xr-x | amar.install | 3 | ||||
| -rw-r--r-- | amar.png | bin | 888 -> 0 bytes | |||
| -rw-r--r-- | amar.py | 93 | ||||
| -rw-r--r-- | amarban.png | bin | 22549 -> 0 bytes | |||
| -rw-r--r-- | gbamar.txt | 1 | ||||
| -rw-r--r-- | org.tnv.amar.policy | 25 |
11 files changed, 12 insertions, 395 deletions
@@ -1,6 +1,6 @@ pkgbase = amar-installer - pkgdesc = Install AMAR repository - pkgver = 1.9.12.fb + pkgdesc = Will remove AMAR this is the end of AMAR + pkgver = 2.0 pkgrel = 1 url = https://www.tuxnvape.fr/ install = amar.install @@ -8,20 +8,8 @@ pkgbase = amar-installer license = GPL3 depends = python depends = python-gobject - source = amar.py - source = amar.png - source = amar.desktop - source = amar.conf - source = amar.glade - source = amarban.png - source = org.tnv.amar.policy - sha256sums = fe40dcd2375a8dafba8c37a28afbd74a71f440f0370809f9c881f576627a11f5 - sha256sums = 874700067f446dff59f8e4e6c3b14519ca8afdf31742af629343c80002c71376 - sha256sums = c5dbfca766050bdbfd36866c1f479ca8039aae80fa8b2847b376c05087d1364c - sha256sums = d8fafeb25a8b2368803565ed62ba147aa38adfe57089fe44125f5e07eea3d21b - sha256sums = a46c4d4a5b2c8c41f2273d3d6c33d4f36f160e9dc820b929db082ed2414ed02b - sha256sums = 2edefaa6f3143bc2ac3f6a11d069d2a72fc968e492f8e96a2a7e2c9423a4237a - sha256sums = dcf05a9d8c5cfe2cc23523eaab9bbd30932b3d2c68ad8d38edbdcad372053920 + source = gbamar.txt + sha256sums = SKIP pkgname = amar-installer @@ -1,37 +1,19 @@ # Maintainer: Elrondo46 TuxnVape <elrond94@hotmail.com> pkgname=amar-installer -pkgver=1.9.12.fb +pkgver=2.0 pkgrel=1 -pkgdesc="Install AMAR repository" +pkgdesc="Will remove AMAR this is the end of AMAR" arch=('x86_64') license=('GPL3') url="https://www.tuxnvape.fr/" depends=("python" "python-gobject") install=amar.install -source=("amar.py" - "amar.png" - "amar.desktop" - "amar.conf" - "amar.glade" - "amarban.png" - "org.tnv.amar.policy") +source=("gbamar.txt") -sha256sums=('fe40dcd2375a8dafba8c37a28afbd74a71f440f0370809f9c881f576627a11f5' - '874700067f446dff59f8e4e6c3b14519ca8afdf31742af629343c80002c71376' - 'c5dbfca766050bdbfd36866c1f479ca8039aae80fa8b2847b376c05087d1364c' - 'd8fafeb25a8b2368803565ed62ba147aa38adfe57089fe44125f5e07eea3d21b' - 'a46c4d4a5b2c8c41f2273d3d6c33d4f36f160e9dc820b929db082ed2414ed02b' - '2edefaa6f3143bc2ac3f6a11d069d2a72fc968e492f8e96a2a7e2c9423a4237a' - 'dcf05a9d8c5cfe2cc23523eaab9bbd30932b3d2c68ad8d38edbdcad372053920') +sha256sums=('SKIP') 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" - install -Dm644 "amar.glade" "${pkgdir}/usr/share/amar/amar.glade" - install -Dm644 "amarban.png" "${pkgdir}/usr/share/amar/amarban.png" - install -Dm644 "org.tnv.amar.policy" "${pkgdir}/usr/share/polkit-1/actions/org.tnv.amar.policy" + install -Dm644 "gbamar.txt" "${pkgdir}/opt/gbamar.txt" } diff --git a/amar.conf b/amar.conf deleted file mode 100644 index 6f7ad80e5f29..000000000000 --- a/amar.conf +++ /dev/null @@ -1,4 +0,0 @@ -[AMAR] -SigLevel=Never -Server=https://amar.roro-home.fr/AMAR/x86_64/ - diff --git a/amar.desktop b/amar.desktop deleted file mode 100644 index e9f2f7d3d235..000000000000 --- a/amar.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Amar Installer -Type=Application -Comment=Install AMAR -Terminal=false -Exec=pkexec /usr/bin/python /usr/bin/amar.py -Icon=amar -StartupNotify=true -Categories=System; -GenericName=Amar Installer -Keywords=amar diff --git a/amar.glade b/amar.glade deleted file mode 100644 index 6c3c86a3128f..000000000000 --- a/amar.glade +++ /dev/null @@ -1,221 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> -<interface> - <requires lib="gtk+" version="3.20"/> - <object class="GtkWindow" id="mainWindow"> - <property name="can_focus">False</property> - <property name="title" translatable="yes">Installateur du dépot AMAR</property> - <property name="resizable">False</property> - <property name="icon">../../../../usr/share/icons/amar.png</property> - <signal name="destroy" handler="onDestroy" swapped="no"/> - <child> - <placeholder/> - </child> - <child> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="orientation">vertical</property> - <property name="row_spacing">5</property> - <child> - <object class="GtkButton" id="buttonActive"> - <property name="label" translatable="yes">ACTIVER</property> - <property name="width_request">250</property> - <property name="height_request">40</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">center</property> - <property name="valign">end</property> - <property name="margin_top">9</property> - <property name="margin_bottom">9</property> - <signal name="clicked" handler="onClickActive" swapped="no"/> - </object> - <packing> - <property name="left_attach">4</property> - <property name="top_attach">5</property> - <property name="width">3</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">23</property> - <property name="margin_right">47</property> - <property name="margin_top">9</property> - <property name="label" translatable="yes">Le dépôt AMAR (Arch/Manjaro Alternate Repository) est un -dépôt tiers donnant accès à des logiciels supplémentaires -non-accessibles via les dépôts officiels. - -Ce dépôt a été créé afin de pouvoir donner accès simplement à -des logiciels dont l'installation via AUR est problématique ou des logiciels qui ne - concernent que Manjaro et qui sont expulsés d'AUR pour cette raison</property> - <property name="justify">center</property> - <attributes> - <attribute name="foreground" value="#757550507b7b"/> - </attributes> - </object> - <packing> - <property name="left_attach">5</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="pixbuf">../../../../usr/share/amar/amarban.png</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - <property name="width">5</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - </child> - </object> -</interface> diff --git a/amar.install b/amar.install index 0d68c3035adb..2aa9853d808e 100755 --- a/amar.install +++ b/amar.install @@ -1,5 +1,6 @@ post_install() { -exit 0 + sed -i '/amar/d' /etc/pacman.conf + sed -i '/AMAR/d' /etc/pacman.conf } post_upgrade() { diff --git a/amar.png b/amar.png Binary files differdeleted file mode 100644 index 02f24fb0ec02..000000000000 --- a/amar.png +++ /dev/null diff --git a/amar.py b/amar.py deleted file mode 100644 index a0d351b98829..000000000000 --- a/amar.py +++ /dev/null @@ -1,93 +0,0 @@ -#!/usr/bin/python -# Created by Baba Orhum -# NO MORE THIRD PARTS OF CODE SPECIAL THANKS FOR MORAL SUPPORT OF TUXNVAPE -# AND MY DEVEL TEACHER WASCAR - -import os -import gi -from threading import Thread -gi.require_version('Gtk', '3.0') -from gi.repository import Gtk -from gi.overrides import GLib - -class Handler: - def onDestroy(self, *args): - Gtk.main_quit() - - def onClickActive(self, button): - buttonactive.set_sensitive(False) # Now the button is greyed, working :) - buttonactive.set_label('ATTENDEZ SVP') # Sure the button text change to this - thread = Thread(target=pressActive) - thread.daemon = True - thread.start() - -amarpath = "/usr/share/amar/amar.glade" -builder = Gtk.Builder() -builder.add_from_file(amarpath) -builder.connect_signals(Handler()) - -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") - for line in searchfile: - if "amar.conf" in line: - etatamar = 1 - searchfile.close() - -except OSError: - errorButtons() - -buttonactive.set_label('DESACTIVER' if etatamar == 1 else 'ACTIVER') - -configamar = "\n#Do not disable AMAR manually if you use the app\nInclude = /etc/pacman.d/amar.conf\n" - -def success(): - buttonactive.set_sensitive(True) - buttonactive.set_label('DESACTIVER' if etatamar == 1 else 'ACTIVER') - -def pressActive(): - global etatamar - if etatamar == 0: - try: - with open(pacmanfichier, "a") as ecrire: - ecrire.write(configamar) - ecrire.close() - os.system("pacman -Syy") - etatamar = 1 - ecrire.close() - GLib.idle_add(success) - except OSError: - GLib.idle_add(errorButtons) - else: - try: - with open((pacmanfichier), "r") as f: - lines = f.readlines() - lines.remove("#Do not disable AMAR manually if you use the app\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) - os.system ("pacman -Syy") - etatamar = 0 - f.close() - new_f.close() - GLib.idle_add(success) - except OSError: - GLib.idle_add(errorButtons) - -window = builder.get_object("mainWindow") -window.show_all() -Gtk.main()
\ No newline at end of file diff --git a/amarban.png b/amarban.png Binary files differdeleted file mode 100644 index c6c1c68567bc..000000000000 --- a/amarban.png +++ /dev/null diff --git a/gbamar.txt b/gbamar.txt new file mode 100644 index 000000000000..29146f807c8f --- /dev/null +++ b/gbamar.txt @@ -0,0 +1 @@ +GOOD BYE AMAR THANKS FOR USING IT, YOU CAN REMOVE THE AMAR-INSTALLER PACKAGE NOW diff --git a/org.tnv.amar.policy b/org.tnv.amar.policy deleted file mode 100644 index 66465629433f..000000000000 --- a/org.tnv.amar.policy +++ /dev/null @@ -1,25 +0,0 @@ -<?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> |
