👷 actions: reset keyrings instead of refreshing

vnepogodin · vnepogodin · commit 3b0599dd3a92 · 2025-05-01T02:38:19.000+04:00
diff --git a/i18n/af/cachyos_hello.ftl b/i18n/af/cachyos_hello.ftl
@@ -42,7 +42,6 @@ tweak-enabled-title = {$tweak} geaktiveer
 # Tweaks page (fixes)
 remove-lock-title = Verwyder db-slot
 reinstall-title = Herinstalleer alle pakkette
-refresh-keyrings-title = Verfris sleutelringe
 update-system-title = Stelsel opdatering
 remove-orphans-title = Skrap onteiende pakkette
 clear-pkgcache-title = Maak pakketcache skoon
diff --git a/i18n/by/cachyos_hello.ftl b/i18n/by/cachyos_hello.ftl
@@ -41,7 +41,6 @@ tweak-enabled-title = {$tweak} уключаны
 # Tweaks page (fixes)
 remove-lock-title = Выдаліць db lock
 reinstall-title = Пераўсталяваць усе пакеты
-refresh-keyrings-title = Абнавіць ключы
 update-system-title = Абнаўленне сістэмы
 remove-orphans-title = Выдаліць orphans
 clear-pkgcache-title = Ачысціць кэш пакетаў
diff --git a/i18n/ca/cachyos_hello.ftl b/i18n/ca/cachyos_hello.ftl
@@ -42,7 +42,6 @@ tweak-enabled-title = {$tweak} habilitat
 # Tweaks page (fixes)
 remove-lock-title = Suprimeix el blocatge de la base de dades
 reinstall-title = Reinstal·la tots els paquets
-refresh-keyrings-title = Resfresca els clauers
 update-system-title = Actualització del sistema
 remove-orphans-title = Suprimeix els paquets orfes
 clear-pkgcache-title = Neteja la cau de paquets
diff --git a/i18n/cs/cachyos_hello.ftl b/i18n/cs/cachyos_hello.ftl
@@ -41,7 +41,6 @@ tweak-enabled-title = {$tweak} povolen
 # Stránka s úpravami (opravy)
 remove-lock-title = Odstranit zámek db
 reinstall-title = Přeinstalovat všechny balíčky
-refresh-keyrings-title = Obnovit klíčenky
 update-system-title = Aktualizace systému
 remove-orphans-title = Odstranit sirotky balíčků
 clear-pkgcache-title = Vyčistit cache balíčků
diff --git a/i18n/de/cachyos_hello.ftl b/i18n/de/cachyos_hello.ftl
@@ -28,7 +28,6 @@ tweak-enabled-title = {$tweak} aktiviert
 # Tweaks page (fixes)
 remove-lock-title = Entferne Datenbanksperre
 reinstall-title = Alle Pakete neu installieren
-refresh-keyrings-title = Keyring aktualisieren
 update-system-title = System-Aktualisierung
 remove-orphans-title = Nicht verwendete Pakete entfernen
 clear-pkgcache-title = Paket-Cache löschen
diff --git a/i18n/en/cachyos_hello.ftl b/i18n/en/cachyos_hello.ftl
@@ -47,7 +47,7 @@ tweak-ananicycpp-tooltip = Auto-adjust process priorities for better system resp
 # Tweaks page (fixes)
 remove-lock-title = Remove db lock
 reinstall-title = Reinstall all packages
-refresh-keyrings-title = Refresh keyrings
+reset-keyrings-title = Reset keyrings
 update-system-title = System update
 remove-orphans-title = Remove orphans
 clear-pkgcache-title = Clear package cache
diff --git a/i18n/es/cachyos_hello.ftl b/i18n/es/cachyos_hello.ftl
@@ -42,7 +42,6 @@ tweak-enabled-title = {$tweak} habilitado
 # Tweaks page (fixes)
 remove-lock-title = Remover bloqueo de la base de datos
 reinstall-title = Reinstalar todos los paquetes
-refresh-keyrings-title = Actualizar keyrings
 update-system-title = Actualización del sistema
 remove-orphans-title = Eliminar paquetes huérfanos
 clear-pkgcache-title = Limpiar cache de los paquetes
diff --git a/i18n/fr/cachyos_hello.ftl b/i18n/fr/cachyos_hello.ftl
@@ -42,7 +42,6 @@ tweak-enabled-title = {$tweak} activé
 # Tweaks page (fixes)
 remove-lock-title = Supprimer le verrou de la base de données
 reinstall-title = Réinstaller tous les paquets
-refresh-keyrings-title = Mettre à jour les trousseaux de clés
 update-system-title = Mise à jour du système
 remove-orphans-title = Supprimer les orphelins
 clear-pkgcache-title = Nettoyer le cache du paquet
diff --git a/i18n/it/cachyos_hello.ftl b/i18n/it/cachyos_hello.ftl
@@ -28,7 +28,6 @@ tweak-enabled-title = {$tweak} abilitato
 # Tweaks page (fixes)
 remove-lock-title = Rimuovi il blocco della base di dati
 reinstall-title = Reinstalla tutti i pacchetti
-refresh-keyrings-title = Ricarica i keyring
 update-system-title = Aggiorna il sistema
 remove-orphans-title = Rimuovi gli orfani
 clear-pkgcache-title = Pulisci la cache dei pacchetti
diff --git a/i18n/nl/cachyos_hello.ftl b/i18n/nl/cachyos_hello.ftl
@@ -42,7 +42,6 @@ tweak-enabled-title = {$tweak} ingeschakeld
 # Tweaks page (fixes)
 remove-lock-title = Db-vergrendeling opheffen
 reinstall-title = Alle pakketten herinstalleren
-refresh-keyrings-title = Sleutelbossen vernieuwen
 update-system-title = Systeem bijwerken
 remove-orphans-title = Onteigende pakketten verwijderen
 clear-pkgcache-title = Pakketcache wissen
diff --git a/i18n/pl/cachyos_hello.ftl b/i18n/pl/cachyos_hello.ftl
@@ -28,7 +28,6 @@ tweak-enabled-title = {$tweak} włączony
 # Tweaks page (fixes)
 remove-lock-title = Usuń blokadę bazy
 reinstall-title = Przeinstaluj wszystkie pakiety
-refresh-keyrings-title = Odśwież klucze
 update-system-title = Aktualizuj system
 remove-orphans-title = Usuń pakiety osierocone
 clear-pkgcache-title = Wyczyść pamięć podręczną pakietów
diff --git a/i18n/pt-BR/cachyos_hello.ftl b/i18n/pt-BR/cachyos_hello.ftl
@@ -42,7 +42,6 @@ tweak-enabled-title = {$tweak} ativado
 # Tweaks page (fixes)
 remove-lock-title = Remover Trava do Banco de Dados Pacman (db lock)
 reinstall-title = Reinstalar Todos os Pacotes
-refresh-keyrings-title = Atualizar Keyrings
 update-system-title = Atualizar Sistema
 remove-orphans-title = Remover Pacotes Órfãos
 clear-pkgcache-title = Limpar cache de pacotes
diff --git a/i18n/ru/cachyos_hello.ftl b/i18n/ru/cachyos_hello.ftl
@@ -40,7 +40,7 @@ tweak-enabled-title = {$tweak} включен
 # Tweaks page (fixes)
 remove-lock-title = Удалить db lock
 reinstall-title = Переустановить все пакеты
-refresh-keyrings-title = Обновить ключи
+reset-keyrings-title = Сбросить ключи
 update-system-title = Обновить систему
 remove-orphans-title = Удалить orphans
 clear-pkgcache-title = Очистить кэш пакетов
diff --git a/i18n/sk/cachyos_hello.ftl b/i18n/sk/cachyos_hello.ftl
@@ -41,7 +41,6 @@ tweak-enabled-title = {$tweak} povolené
 # Stránka s úpravami (opravy)
 remove-lock-title = Odstrániť zámok db
 reinstall-title = Preinštalovať všetky balíčky
-refresh-keyrings-title = Obnoviť kľúčenky
 update-system-title = Aktualizácia systému
 remove-orphans-title = Odstrániť siroty balíčkov
 clear-pkgcache-title = Vyčistiť cache balíčkov
diff --git a/i18n/sv/cachyos_hello.ftl b/i18n/sv/cachyos_hello.ftl
@@ -42,7 +42,6 @@ tweak-enabled-title = {$tweak} aktiverad
 # Tweaks page (fixes)
 remove-lock-title = Ta bort databaslås
 reinstall-title = Installera om alla paket
-refresh-keyrings-title = Uppdatera nyckelringar
 update-system-title = Systemuppdatering
 remove-orphans-title = Ta bort föräldralösa
 clear-pkgcache-title = Töm paketcache
diff --git a/i18n/tr/cachyos_hello.ftl b/i18n/tr/cachyos_hello.ftl
@@ -42,7 +42,6 @@ tweak-enabled-title = {$tweak} etkinleştirildi.
 # Tweaks page (fixes)
 remove-lock-title = Pacman veri tabanı kilidini kaldır
 reinstall-title = Tüm paketleri yeniden kur
-refresh-keyrings-title = Veri anahtarlıklarını yenile
 update-system-title = Sistem güncellemesi
 remove-orphans-title = Artıkları(orphans) kaldır
 clear-pkgcache-title = Önbellekteki paketleri temizle 
diff --git a/i18n/zh-CN/cachyos_hello.ftl b/i18n/zh-CN/cachyos_hello.ftl
@@ -39,7 +39,6 @@ tweak-enabled-title = {$tweak} 已启用
 # Tweaks page (fixes)
 remove-lock-title = 移除数据库锁
 reinstall-title = 重新安装所有软件包
-refresh-keyrings-title = 刷新密钥环
 update-system-title = 更新系统
 remove-orphans-title = 删除孤立软件包
 clear-pkgcache-title = 清理软件包缓存
diff --git a/src/actions.rs b/src/actions.rs
@@ -156,29 +156,15 @@ pub fn remove_orphans(dialog_tx: Sender<DialogMessage>) {
     let _ = utils::run_cmd_terminal(format!("pacman -Rns {orphan_pkgs}"), true);
 }
 
-pub fn refresh_keyring() {
-    let pacman = pacmanconf::Config::with_opts(None, Some("/etc/pacman.conf"), Some("/")).unwrap();
-    let alpm = alpm_utils::alpm_with_conf(&pacman).unwrap();
-
-    // search local database for packages matching the regex ".*-keyring"
-    // e.g pacman -Qq | grep keyring
-    let needles: &[String] = &[".*-keyring".into()];
-    let found_keyrings = alpm
-        .localdb()
-        .search(needles.iter())
-        .unwrap()
-        .into_iter()
-        .filter(|pkg| pkg.name() != "gnome-keyring" && pkg.name() != "python-keyring")
-        .fold(String::new(), |mut output, pkg| {
-            let pkgname = str::replace(pkg.name(), "-keyring", "");
-            let _ = write!(output, "{pkgname} ");
-            output
-        });
-
-    let _ = utils::run_cmd_terminal(
-        format!("pacman-key --init && pacman-key --populate {found_keyrings}"),
-        true,
-    );
+pub fn reset_keyring() {
+    let key_reset = r#"
+rm -rf /etc/pacman.d/gnupg/ && \
+pacman-key --init && pacman-key --populate && \
+pacman-key --recv-keys F3B607488DB35A47 --keyserver keyserver.ubuntu.com && \
+pacman-key --lsign-key F3B607488DB35A47
+"#;
+
+    let _ = utils::run_cmd_terminal(key_reset.into(), true);
 }
 
 pub fn install_needed_packages(
diff --git a/src/pages.rs b/src/pages.rs
@@ -260,7 +260,7 @@ fn create_fixes_section(builder: &Builder) -> gtk::Box {
 
     let removelock_btn = create_gtk_button!("remove-lock-title");
     let reinstall_btn = create_gtk_button!("reinstall-title");
-    let refreshkeyring_btn = create_gtk_button!("refresh-keyrings-title");
+    let resetkeyring_btn = create_gtk_button!("reset-keyrings-title");
     let update_system_btn = create_gtk_button!("update-system-title");
     let remove_orphans_btn = create_gtk_button!("remove-orphans-title");
     let clear_pkgcache_btn = create_gtk_button!("clear-pkgcache-title");
@@ -290,7 +290,7 @@ fn create_fixes_section(builder: &Builder) -> gtk::Box {
             actions::reinstall_packages();
         });
     });
-    refreshkeyring_btn.connect_clicked(on_refreshkeyring_btn_clicked);
+    resetkeyring_btn.connect_clicked(on_resetkeyring_btn_clicked);
     update_system_btn.connect_clicked(on_update_system_btn_clicked);
     remove_orphans_btn.connect_clicked(move |_| {
         // Spawn child process in separate thread.
@@ -368,7 +368,7 @@ fn create_fixes_section(builder: &Builder) -> gtk::Box {
     topbox.pack_start(&label, true, false, 1);
     button_box_f.pack_start(&update_system_btn, true, true, 2);
     button_box_f.pack_start(&reinstall_btn, true, true, 2);
-    button_box_f.pack_end(&refreshkeyring_btn, true, true, 2);
+    button_box_f.pack_end(&resetkeyring_btn, true, true, 2);
     button_box_s.pack_start(&removelock_btn, true, true, 2);
     button_box_s.pack_start(&clear_pkgcache_btn, true, true, 2);
     button_box_s.pack_end(&remove_orphans_btn, true, true, 2);
@@ -875,10 +875,10 @@ fn on_servbtn_clicked(button: &gtk::CheckButton) {
     );
 }
 
-fn on_refreshkeyring_btn_clicked(_: &gtk::Button) {
+fn on_resetkeyring_btn_clicked(_: &gtk::Button) {
     // Spawn child process in separate thread.
     std::thread::spawn(move || {
-        actions::refresh_keyring();
+        actions::reset_keyring();
     });
 }
 
