From 8e4d134cbc87570a0166d15dad0be6d7baaebe34 Mon Sep 17 00:00:00 2001 From: Alexander B <2480-beliys@users.noreply.gitlab.manjaro.org> Date: Mon, 15 Nov 2021 21:28:51 +0000 Subject: [PATCH] add rank_mirrors_continent --- data/translations/danish.trans | 3 ++- data/translations/dutch.trans | 3 ++- data/translations/english.trans | 3 ++- data/translations/french.trans | 3 ++- data/translations/german.trans | 7 +++--- data/translations/hungarian.trans | 3 ++- data/translations/italian.trans | 3 ++- data/translations/polish.trans | 3 ++- data/translations/portuguese.trans | 3 ++- data/translations/portuguese_brasil.trans | 3 ++- data/translations/russian.trans | 3 ++- data/translations/spanish.trans | 3 ++- data/translations/turkish.trans | 3 ++- data/translations/ukrainian.trans | 3 ++- lib/util.sh | 28 ++++++++++++++++++++--- 15 files changed, 55 insertions(+), 19 deletions(-) diff --git a/data/translations/danish.trans b/data/translations/danish.trans index 2dbb6d3..6bb412e 100644 --- a/data/translations/danish.trans +++ b/data/translations/danish.trans @@ -195,7 +195,8 @@ _MirrorlistBody="Serverlisten indeholder servere som pacman bruger for at hente _RankMirrors="Udpeg de ønskede server med [MELLEMRUM] eller [ENTER] og bekræft valget med [OK] knappen nederst." _MirrorbyCountry="Opret Server liste efter Land" _MirrorEdit="Rediger serverliste" -_MirrorRankTitle="Kør RankMirrors" +_MirrorRankTitle="Kør RankMirrors (all)" +_MirrorRankTitleContinent="Kør RankMirrors (continent)" _MirrorRestTitle="Gendan oprindelig serverliste" _MirrorRankBody="Søger de hurtigste server fra listen." _MirrorNoneBody="Der er ingen kopi af serverlisten." diff --git a/data/translations/dutch.trans b/data/translations/dutch.trans index 4319788..ad51232 100644 --- a/data/translations/dutch.trans +++ b/data/translations/dutch.trans @@ -193,7 +193,8 @@ _MirrorlistBody="De mirrorlijst bevat server-adressen die worden gebruikt door p _RankMirrors="Selecteer je eigen mirrors met [Spatiebalk] of [Enter] en bevestig met de [OK] toets onderaan." _MirrorbyCountry="Genereer een mirrorlijst gesorteerd volgens Land" _MirrorEdit="Pas de Mirrorlijst manueel aan" -_MirrorRankTitle="Start RankMirrors" +_MirrorRankTitle="Start RankMirrors (all)" +_MirrorRankTitleContinent="Start RankMirrors (continent)" _MirrorRestTitle="Herstel de originele mirrorlijst" _MirrorRankBody="Zoeken naar de snelste servers op de mirrorlijst." _MirrorNoneBody="Er werd geen versie van de originele mirrorlijst gevonden." diff --git a/data/translations/english.trans b/data/translations/english.trans index f64b7c0..287d44a 100644 --- a/data/translations/english.trans +++ b/data/translations/english.trans @@ -192,7 +192,8 @@ _MirrorlistBody="The mirrorlist contains server addresses used by pacman to inst _RankMirrors="Select your custom mirrors using [Spacebar] or [Enter] and confirm with the [OK] button at the bottom." _MirrorbyCountry="Generate mirrorlist by Country" _MirrorEdit="Manually edit mirrorlist" -_MirrorRankTitle="Rank Mirrors by Speed" +_MirrorRankTitle="Rank Mirrors by Speed (all)" +_MirrorRankTitleContinent="Rank Mirrors by Speed (continent)" _MirrorRestTitle="Restore Original Mirrorlist" _MirrorRankBody="Finding the fastest servers from the mirrorlist." _MirrorNoneBody="A copy of the original mirrorlist was not found." diff --git a/data/translations/french.trans b/data/translations/french.trans index 626b25c..41960e5 100644 --- a/data/translations/french.trans +++ b/data/translations/french.trans @@ -196,7 +196,8 @@ _MirrorlistBody="La liste des miroirs contient les adresses des serveurs utilis _RankMirrors="Sélection des miroirs, utiliser [barre espace] ou [touche entrée] puis confirmer avec le bouton [Oui] positionné en bas." _MirrorbyCountry="Générer la liste de miroirs par pays" _MirrorEdit="Éditer manuellement la liste des miroirs" -_MirrorRankTitle="Exécuter le classement des miroirs" +_MirrorRankTitle="Exécuter le classement des miroirs (all)" +_MirrorRankTitleContinent="Exécuter le classement des miroirs (continent)" _MirrorRestTitle="Restaurer la liste originale des miroirs" _MirrorRankBody="Recherche des serveurs les plus rapides appartenant à la liste des miroirs." _MirrorNoneBody="La copie de la liste originale des miroirs est introuvable." diff --git a/data/translations/german.trans b/data/translations/german.trans index 32af9bf..329f187 100644 --- a/data/translations/german.trans +++ b/data/translations/german.trans @@ -192,7 +192,8 @@ _MirrorlistBody="Die Mirrorliste enthält die Adressen der Server, von denen Pac _RankMirrors="Wählen Sie die gewünschten Mirror mit [Leertaste] oder [Enter] aus und bestätigen Sie mit [OK] unten auf der Seite." _MirrorbyCountry="Generiere Mirrorlist für ein Land" _MirrorEdit="Manuelle Änderung der Mirrorlist" -_MirrorRankTitle="Ordne Mirror nach Geschwindigkeit" +_MirrorRankTitle="Ordne Mirror nach Geschwindigkeit (all)" +_MirrorRankTitleContinent="Ordne Mirror nach Geschwindigkeit (continent)" _MirrorRestTitle="Ursprüngliche Mirrorlist wiederherstellen" _MirrorRankBody="Finden der schnellsten Server aus der Mirrorlist" _MirrorNoneBody="Eine Kopie der ursprünglichen Mirrorlist konnte nicht gefunden werden." @@ -452,7 +453,7 @@ _InfoNWKernel="Unterstützung für die Netzwerkkarte ist im Kernel eingebaut\nKe _InstNMMenuBody="Für Netzwerk- und Wireless-Geräte sind möglicherweise zusätzliche Pakete erforderlich. Einige drahtlose Geräte benötigen möglicherweise auch zusätzliche Firmware, um zu funktionieren." _InstNMMenuPkg="Installiere Wireless Treiber Pakete" _InstNMMenuNM="Install Network Connection Manager" # translate me ! -_InstNMMenuCups="CUPS / Drucker-Pakete installieren" +_InstNMMenuCups="CUPS / Drucker-Pakete installieren" _InstNMMenuPkgBody="Die wichtigsten WLAN-Pakete werden vorab geprüft, wenn ein drahtloses Gerät erkannt wurde. Wenn Sie sich bei zusätzlicher Firmware unsicher sind, können alle Pakete installiert werden." _SeeWirelessDev="Drahtloses Gerät anzeigen (optional)" _WirelessShowTitle="Drahtloses Gerät" @@ -511,7 +512,7 @@ _InstDsMenuTitle="Desktop-System installieren" <<<<<<< HEAD _InstDsMenuBody="Dies installiert eine vollständige Manjaro Edition mit grafischer Oberfläche. Schritte 1-3 ======= -_InstDsMenuBody="Dies installiert eine vollständige Manjaro Edition mit grafischer Oberfläche. Schritte 1-3 +_InstDsMenuBody="Dies installiert eine vollständige Manjaro Edition mit grafischer Oberfläche. Schritte 1-3 >>>>>>> maintainance Dies installiert die vollständige Manjaro-Edition mit grafischer Desktop-Umgebung. sind für ein funktionierendes System erforderlich, der Rest optional." _InstCsMenuTitle="Individuelles System installieren" diff --git a/data/translations/hungarian.trans b/data/translations/hungarian.trans index 42a95f8..3f5090b 100644 --- a/data/translations/hungarian.trans +++ b/data/translations/hungarian.trans @@ -193,7 +193,8 @@ _MirrorlistBody="A szerverlista szerver címeket tartalmaz, melyeket a pacman ha _RankMirrors="Válaszd ki a kívánt szervereket a [Szóköz] vagy az [Enter] billentyűvel, ha befejezted, válaszd az OK-t." _MirrorbyCountry="Szerverlista létrehozása ország alapján" _MirrorEdit="Szerverlista kézi szerkesztése" -_MirrorRankTitle="Szerverek rangsorolás sebesség alapján" +_MirrorRankTitle="Szerverek rangsorolás sebesség alapján (all)" +_MirrorRankTitleContinent="Szerverek rangsorolás sebesség alapján (continent)" _MirrorRestTitle="Eredeti szerverlista helyreállítása" _MirrorRankBody="A leggyorsabb szerver megkeresése a listából." _MirrorNoneBody="Az eredeti szerverlista másolata nem található." diff --git a/data/translations/italian.trans b/data/translations/italian.trans index 97dab02..e92fbeb 100644 --- a/data/translations/italian.trans +++ b/data/translations/italian.trans @@ -194,7 +194,8 @@ _MirrorlistBody="La lista mirror contiene gli indirizzi server utilizzati da pac _RankMirrors="Seleziona lista dei mirrors personalizzata, [Spazio] o [Enter] per selezionare e conferma con [OK] in basso." _MirrorbyCountry="Genera lista mirror per località geografica" _MirrorEdit="Modifica manualmente la lista dei mirror" -_MirrorRankTitle="Esegui RankMirrors" +_MirrorRankTitle="Esegui RankMirrors (all)" +_MirrorRankTitleContinent="Esegui RankMirrors (continent)" _MirrorRestTitle="Ripristina lista mirror originale" _MirrorRankBody="Ricerca server più veloce nella lista mirror." _MirrorNoneBody="Una copia della lista dei mirror originale non è stata trovata." diff --git a/data/translations/polish.trans b/data/translations/polish.trans index c2bb173..88615c9 100644 --- a/data/translations/polish.trans +++ b/data/translations/polish.trans @@ -192,7 +192,8 @@ _MirrorlistBody="Lista serwerów lustrzanych (mirrorów) zawiera adresy serweró _RankMirrors="Wybierz niestandardowe serwery lustrzane [Spacja] lub [Enter] i potwierdź przyciskiem [OK] znajdującym się na dole." _MirrorbyCountry="Generowanie listy mirrorów wg kraju." _MirrorEdit="Ręczna edycja listy serwerów lustrzanych" -_MirrorRankTitle="Ustaw serwery lustrzane wg prędkości" +_MirrorRankTitle="Ustaw serwery lustrzane wg prędkości (all)" +_MirrorRankTitleContinent="Ustaw serwery lustrzane wg prędkości (continent)" _MirrorRestTitle="Przywróć oryginalną listę serwerów." _MirrorRankBody="Wyszukiwanie najszybszych serwerów z listy." _MirrorNoneBody="Nie znaleziono kopii listy oryginalnych serwerów." diff --git a/data/translations/portuguese.trans b/data/translations/portuguese.trans index a1186ed..2f8c596 100644 --- a/data/translations/portuguese.trans +++ b/data/translations/portuguese.trans @@ -192,7 +192,8 @@ _MirrorlistBody="O mirrorlist contém endereços dos servidores usados pelo pacm _RankMirrors="Selected your custom mirrors using [Spacebar] or [Enter] and confirm with the [OK] button at the bottom." # translate me ! _MirrorbyCountry="Gerar mirrorlist por País" _MirrorEdit="Editar manualmente o mirrorlist" -_MirrorRankTitle="Executar o RankMirrors" +_MirrorRankTitle="Executar o RankMirrors (all)" +_MirrorRankTitleContinent="Executar o RankMirrors (continent)" _MirrorRestTitle="Restaurar mirrorlist para original" _MirrorRankBody="Encontrar os mais rápidos servidores do mirrorlist." _MirrorNoneBody="Uma cópia mirrorlist original não foi encontrado." diff --git a/data/translations/portuguese_brasil.trans b/data/translations/portuguese_brasil.trans index 23e8326..7f587fc 100644 --- a/data/translations/portuguese_brasil.trans +++ b/data/translations/portuguese_brasil.trans @@ -194,7 +194,8 @@ _MirrorlistBody="A lista de espelhos contém endereços dos servidores usados pe _RankMirrors="Selecione espelhos de sua escolha usando [Barra de Espaço] ou [Enter] e confirme com o botão [OK] no final." _MirrorbyCountry="Gerar lista de espelhos por País" _MirrorEdit="Editar manualmente a lista de espelhos" -_MirrorRankTitle="Executar o RankMirrors" +_MirrorRankTitle="Executar o RankMirrors (all)" +_MirrorRankTitleContinent="Executar o RankMirrors (continent)" _MirrorRestTitle="Restaurar a lista de espelhos original" _MirrorRankBody="Pesquisando os servidores rápidos da lista de espelho." _MirrorNoneBody="Uma cópia da lista de espelhos original não foi encontrada." diff --git a/data/translations/russian.trans b/data/translations/russian.trans index f092a4f..e6d0dbd 100644 --- a/data/translations/russian.trans +++ b/data/translations/russian.trans @@ -197,7 +197,8 @@ _MirrorlistBody="Список зеркал содержит адреса сер _RankMirrors="Выберите пользовательские зеркала с помощью [Пробел] или [Enter] и подтвердите кнопкой [ОК] в нижней части." _MirrorbyCountry="Сгенерировать список зеркал по стране" _MirrorEdit="Редактировать список зеркал вручную" -_MirrorRankTitle="Запустить RankMirrors" +_MirrorRankTitle="Запустить RankMirrors (all)" +_MirrorRankTitleContinent="Запустить RankMirrors (continent)" _MirrorRestTitle="Восстановить оригинальный список зеркал" _MirrorRankBody="Поиск самого быстрого сервера из списка зеркал." _MirrorNoneBody="Копия оригинального списка зеркал не найдена." diff --git a/data/translations/spanish.trans b/data/translations/spanish.trans index afb93cd..55172fb 100644 --- a/data/translations/spanish.trans +++ b/data/translations/spanish.trans @@ -193,7 +193,8 @@ _MirrorlistBody="La lista de mirrors contiene direcciones de servidores utilizad _RankMirrors="Selecciona tus mirrors personalizados usando [Barra Espaciadora] o [Entrar] y confírmalo con el botón [OK] en la parte de abajo." _MirrorbyCountry="Generar lista de mirrors por países" _MirrorEdit="Editar manualmente la lista de mirrors" -_MirrorRankTitle="Ejecutar RankMirrors" +_MirrorRankTitle="Ejecutar RankMirrors (all)" +_MirrorRankTitleContinent="Ejecutar RankMirrors (continent)" _MirrorRestTitle="Restablecer lista de mirrors original" _MirrorRankBody="Buscando los servidores más rápidos de la lista de mirrors." _MirrorNoneBody="Se ha encontrado una copia de la lista original de mirrors." diff --git a/data/translations/turkish.trans b/data/translations/turkish.trans index c7e6227..e48b600 100755 --- a/data/translations/turkish.trans +++ b/data/translations/turkish.trans @@ -144,7 +144,8 @@ _MirrorlistBody="Mirrorlist, pacman tarafından paketleri yüklemek için kullan _RankMirrors="Özel aynalarınızı [Boşluk] tuşu veya [Enter] ve alttaki [OK] ile onaylayın." _MirrorbyCountry="Ülkeye göre Mirrorlist oluştur" _MirrorEdit="Mirrorlisti el ile düzenle" -_MirrorRankTitle="Hıza göre Mirrorlist oluştur" +_MirrorRankTitle="Hıza göre Mirrorlist oluştur (all)" +_MirrorRankTitleContinent="Hıza göre Mirrorlist oluştur (continent)" _MirrorRestTitle="Orijinal Mirrorlist Geri Yükle" _MirrorRankBody="Mirrorlist ten en hızlı sunucuları bulma." _MirrorNoneBody="Orijinal Mirrorlist in bir kopyası bulunamadı." diff --git a/data/translations/ukrainian.trans b/data/translations/ukrainian.trans index 3f64944..114ccf7 100644 --- a/data/translations/ukrainian.trans +++ b/data/translations/ukrainian.trans @@ -194,7 +194,8 @@ _MirrorlistBody="Список дзеркал містить адреси сер _RankMirrors="Оберіть користувацькі дзеркала за допомогою [Пробіл] або [Enter] та підтвердіть кнопкою [ОК] в нижній частині." _MirrorbyCountry="Згенерувати список дзеркал по країні" _MirrorEdit="Редагувати список дзеркал вручну" -_MirrorRankTitle="Запустити RankMirrors" +_MirrorRankTitle="Запустити RankMirrors (all)" +_MirrorRankTitleContinent="Запустити RankMirrors (continent)" _MirrorRestTitle="Відновити оригінальний список дзеркал" _MirrorRankBody="Пошук найшвидшого серверу зі списку дзеркал." _MirrorNoneBody="Копія оригінального списку дзеркал не знайдена." diff --git a/lib/util.sh b/lib/util.sh index 53ffacf..0758de4 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -434,8 +434,9 @@ configure_mirrorlist() { DIALOG " $_MirrorlistTitle " --default-item ${HIGHLIGHT_SSUB} --menu "\n$_MirrorlistBody\n " 25 60 4 \ "1" "$_MirrorPacman" \ "2" "$_MirrorConfig" \ - "3" "$_MirrorRankTitle" \ - "4" "$_Back" 2>${ANSWER} + "3" "$_MirrorRankTitleContinent" \ + "4" "$_MirrorRankTitle" \ + "5" "$_Back" 2>${ANSWER} HIGHLIGHT_SSUB=$(cat ${ANSWER}) case $(cat ${ANSWER}) in @@ -448,7 +449,9 @@ configure_mirrorlist() { "2") nano /etc/pacman-mirrors.conf check_for_error "edit pacman-mirrors.conf" ;; - "3") rank_mirrors + "3") rank_mirrors_continent + ;; + "4") rank_mirrors ;; *) loopmeu=0 @@ -477,6 +480,25 @@ rank_mirrors() { ini branch "${branch}" } +rank_mirrors_continent() { + #Choose the branch for mirrorlist + local branch="" + local oldbranch="$(grep -oE -m 1 "stable|stable-staging|testing|unstable" /etc/pacman.d/mirrorlist)" + branch=$(DIALOG " $_MirrorBranch " --radiolist "\n$_UseSpaceBar\n " 0 0 3 \ + "stable" "-" on \ + "stable-staging" "-" off \ + "testing" "-" off \ + "unstable" "-" off 3>&1 1>&2 2>&3) + [[ -z "${branch}" ]] && return 0 + clear + DIALOG " $_MirrorBranch " --msgbox "\n$_RankMirrors\n " 0 0 + clear + pacman-mirrors -iaB "${branch}" --continent + [[ "$oldbranch" != "$branch" ]] && pacman -Syy + echo "" + ini branch "${branch}" +} + # Simple code to show devices / partitions. show_devices() { lsblk -o NAME,MODEL,TYPE,FSTYPE,SIZE,MOUNTPOINT | grep "disk\|part\|lvm\|crypt\|NAME\|MODEL\|TYPE\|FSTYPE\|SIZE\|MOUNTPOINT" > /tmp/.devlist