[configure_mirrorlist] suggest a version working on Manjaro, close

https://github.com/Chrysostomus/aif-dev/issues/14
7 years ago · 9328492176
parent 781cbb371b
commit 9328492176
11 changed files with 89 additions and 61 deletions
--- a/136
+++ b/136
@ -301,71 +301,90 @@ show_devices() {
 configure_mirrorlist() {

 # Generate a mirrorlist based on the country chosen.
-mirror_by_country() {
- BRANCH="/tmp/.branch"
- COUNTRY_LIST=""
- countries_list="Africa AF Australia AU Austria AT Belarus BY Belgium BE Brasil BR Bulgaria BG Canada CA Chile CL China CN Colombia CO Costa_Rica CR Czech CZ Denmark DK Ecuador EQ France FR Germany DE Greece GR Indonesia ID Ireland IE Italy IT Japan JP Netherlands NL Philippines PH Poland PL Portugal PT Romania RO Russia RU Singapore SG Sweden SE Taiwan TW Turkey TR United_Kingdom GB United_States US Vietnam VN"
-
- for i in ${countries_list}; do
-     COUNTRY_LIST="${COUNTRY_LIST} ${i}"
- done
-
- dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_MirrorlistTitle " --menu "$_MirrorCntryBody" 0 0 0 $COUNTRY_LIST 2>${ANSWER} || install_base_menu
-
- #URL="https://www.archlinux.org/mirrorlist/?country=$(cat ${ANSWER})&use_mirror_status=on"
- #Choose the branch for mirrorlist
- MIRROR_TEMP=$(mktemp --suffix=-mirrorlist)
- dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " Choose manjaro branch to use " --radiolist " $_UseSpaceBar" 0 0 12 \
-  "stable" "-" on \
-  "testing" "-" off \
-  "unstable" "-" off 2>${BRANCH}
-
- # Get latest mirror list and save to tmpfile
- dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_MirrorlistTitle " --infobox "$_PlsWaitBody" 0 0
-  pacman-mirrors -g -b $(cat ${BRANCH}) -c $(cat ${ANSWER}) -o ${MIRROR_TEMP} 2>/tmp/.errlog
-# curl -so ${MIRROR_TEMP} ${URL} 2>/tmp/.errlog
- check_for_error
- sed -i 's/^#Server/Server/g' ${MIRROR_TEMP}
- nano ${MIRROR_TEMP}
-
- dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_MirrorlistTitle " --yesno "$_MirrorGenQ" 0 0
-
- if [[ $? -eq 0 ]];then
-    mv -f /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.orig
-    mv -f ${MIRROR_TEMP} /etc/pacman.d/mirrorlist
-    chmod +r /etc/pacman.d/mirrorlist
-    dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_MirrorlistTitle " --infobox "\n$_Done!\n\n" 0 0
-  sleep 2
- else
-    configure_mirrorlist
- fi
-}
-
-
+#mirror_by_country() {
+# BRANCH="/tmp/.branch"
+# COUNTRY_LIST=""
+# countries_list="Africa AF Australia AU Austria AT Belarus BY Belgium BE Brasil BR Bulgaria BG Canada CA Chile CL China CN Colombia CO Costa_Rica CR Czech CZ Denmark DK Ecuador EQ France FR Germany DE Greece GR Indonesia ID Ireland IE Italy IT Japan JP Netherlands NL Philippines PH Poland PL Portugal PT Romania RO Russia RU Singapore SG Sweden SE Taiwan TW Turkey TR United_Kingdom GB United_States US Vietnam VN"
+#
+# for i in ${countries_list}; do
+#     COUNTRY_LIST="${COUNTRY_LIST} ${i}"
+# done
+#
+# dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_MirrorlistTitle " --menu "$_MirrorCntryBody" 0 0 0 $COUNTRY_LIST 2>${ANSWER} || install_base_menu
+#
+# #URL="https://www.archlinux.org/mirrorlist/?country=$(cat ${ANSWER})&use_mirror_status=on"
+# #Choose the branch for mirrorlist
+# MIRROR_TEMP=$(mktemp --suffix=-mirrorlist)
+# dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " Choose Manjaro branch to use " --radiolist " $_UseSpaceBar" 0 0 12 \
+#  "stable" "-" on \
+#  "testing" "-" off \
+#  "unstable" "-" off 2>${BRANCH}
+#
+# # Get latest mirror list and save to tmpfile
+# dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_MirrorlistTitle " --infobox "$_PlsWaitBody" 0 0
+#  pacman-mirrors -g -b $(cat ${BRANCH}) -c $(cat ${ANSWER}) -o ${MIRROR_TEMP} 2>/tmp/.errlog
+## curl -so ${MIRROR_TEMP} ${URL} 2>/tmp/.errlog
+# check_for_error
+# sed -i 's/^#Server/Server/g' ${MIRROR_TEMP}
+# nano ${MIRROR_TEMP}
+#
+# dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_MirrorlistTitle " --yesno "$_MirrorGenQ" 0 0
+#
+# if [[ $? -eq 0 ]];then
+#    mv -f /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.orig
+#    mv -f ${MIRROR_TEMP} /etc/pacman.d/mirrorlist
+#    chmod +r /etc/pacman.d/mirrorlist
+#    dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_MirrorlistTitle " --infobox "\n$_Done!\n\n" 0 0
+#  sleep 2
+# else
+#    configure_mirrorlist
+# fi
+#}
+
+#dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_MirrorlistTitle " \
+#    --menu "$_MirrorlistBody" 0 0 6 \
+#  "1" "$_MirrorbyCountry" \
+#  "2" "$_MirrorEdit" \
+#  "3" "$_MirrorRestTitle" \
+#  "4" "$_MirrorPacman" \
+#  "5" "$_Back" 2>${ANSWER}
+  
 dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_MirrorlistTitle " \
    --menu "$_MirrorlistBody" 0 0 6 \
-  "1" "$_MirrorbyCountry" \
-  "2" "$_MirrorEdit" \
-  "3" "$_MirrorRestTitle" \
-  "4" "$_MirrorPacman" \
-  "5" "$_Back" 2>${ANSWER}
+  "1" "$_MirrorRankTitle" \
+  "2" "$_MirrorConfig" \
+  "3" "$_MirrorPacman" \
+  "4" "$_Back" 2>${ANSWER}
+
+#    case $(cat ${ANSWER}) in
+#        "1") mirror_by_country
+#             ;;
+#        "2") nano /etc/pacman.d/mirrorlist
+#            ;;
+#        "3") if [[ -e /etc/pacman.d/mirrorlist.orig ]]; then
+#         mv -f /etc/pacman.d/mirrorlist.orig /etc/pacman.d/mirrorlist
+#         dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_MirrorlistTitle " --msgbox "\n$_Done!\n\n" 0 0
+#          else
+#             dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_ErrTitle " --msgbox "$_MirrorNoneBody" 0 0
+#          fi
+#             ;;
+#         "4") nano /etc/pacman.conf
+#        dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_MirrorPacman " --yesno "$_MIrrorPacQ" 0 0 && COPY_PACCONF=1 || COPY_PACCONF=0
+#        pacman -Syy
+#      ;;
+#    *) install_base_menu
+#             ;;
+#    esac

    case $(cat ${ANSWER}) in
-        "1") mirror_by_country
-             ;;
-        "2") nano /etc/pacman.d/mirrorlist
+        "1") pacman-mirrors -g -i
             ;;
-        "3") if [[ -e /etc/pacman.d/mirrorlist.orig ]]; then
-         mv -f /etc/pacman.d/mirrorlist.orig /etc/pacman.d/mirrorlist
-         dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_MirrorlistTitle " --msgbox "\n$_Done!\n\n" 0 0
-          else
-             dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_ErrTitle " --msgbox "$_MirrorNoneBody" 0 0
-          fi
+        "2") nano /etc/pacman-mirrors.conf
             ;;
-         "4") nano /etc/pacman.conf
+        "3") nano /etc/pacman.conf
        dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_MirrorPacman " --yesno "$_MIrrorPacQ" 0 0 && COPY_PACCONF=1 || COPY_PACCONF=0
        pacman -Syy
-      ;;
+             ;;
    *) install_base_menu
             ;;
    esac
@ -373,7 +392,6 @@ dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_MirrorlistTitle " \
    configure_mirrorlist
 }

-
 # virtual console keymap
 set_keymap() {

@ -2849,7 +2867,7 @@ install_graphics_menu() {
    dialog --default-item ${HIGHLIGHT_SUB} --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_InstGrMenuTitle " --menu "$_InstGrMenuBody" 0 0 7 \
  "1" "$_InstGrMenuDS" \
  "2" "$_InstGrMenuDD" \
-  "3" "Install manjaro desktop" \
+  "3" "Install Manjaro Desktop" \
  "4" "$_InstGrMenuGE" \
  "5" "$_InstGrMenuDM" \
  "6" "$_PrepKBLayout" \
--- a/translations/danish.trans
+++ b/translations/danish.trans
@ -133,6 +133,7 @@ _MirrorRankBody="\nSøger de hurtigste server fra listen."
 _MirrorNoneBody="\nDer er ingen kopi af server listen.\n\n"
 _MirrorCntryBody="\nDer oprettes en liste over servere for det valgte land.\n"
 _MirrorGenQ="Brug denne server liste til installation?"
+_MirrorConfig="Ret pacman server opsætning"
 _MirrorPacman="Ret pacman opsætning"
 _MIrrorPacQ="\nBrug den rettede pacman opsætning til det færdige system? Hvis ja, vil filen blive kopieret over efter den installation af Manjaro Base\n"

--- a/translations/dutch.trans
+++ b/translations/dutch.trans
@ -133,6 +133,7 @@ _MirrorRankBody="\nZoeken naar de snelste servers op de mirrorlijst."
 _MirrorNoneBody="\nEr werd geen versie van de originele mirrorlijst gevonden.\n\n"
 _MirrorCntryBody="\nEr zal een lijst van mirrors per land worden gegenereerd.\n"
 _MirrorGenQ="Gebruik je de gegenereerde mirrorlijst voor het installatieprogramma?"
+_MirrorConfig="Bewerkt het pacman mirror configuratiebestand"
 _MirrorPacman="Bewerkt het pacman configuratiebestand"
 _MIrrorPacQ="\nWil je het aangepast pacman configuratiebestand gebruiken voor het geïnstalleerde systeem? Zo ja, zal het bestand gekopieerd worden zodra het basissysteem is geïnstalleerd.\n\n"

--- a/translations/english.trans
+++ b/translations/english.trans
@ -127,13 +127,14 @@ _MirrorlistTitle="Mirrorlist"
 _MirrorlistBody="\nThe mirrorlist contains server addresses used by pacman to install packages. To find the fastest servers, FIRST generate a mirrorlist by country BEFORE running RankMirrors, otherwise the process will take a LONG TIME.\n\nThe pacman configuration file can be edited to enable multilib and other repositories.\n\nNOTE: Close text files with '[CTRL] + [x]'. If edited, then press [y] to save or [n] to discard changes.\n"
 _MirrorbyCountry="Generate mirrorlist by Country"
 _MirrorEdit="Manually edit mirrorlist"
-_MirrorRankTitle="Run RankMirrors"
+_MirrorRankTitle="Rank Mirrors by Speed"
 _MirrorRestTitle="Restore original mirrorlist"
 _MirrorRankBody="\nFinding the fastest servers from the mirrorlist."
 _MirrorNoneBody="\nA copy of the original mirrorlist was not found.\n\n"
 _MirrorCntryBody="\nA list of mirrors by the selected country will be generated.\n"
 _MirrorGenQ="Use generated mirrorlist for installer?"
-_MirrorPacman="Edit pacman configuration"
+_MirrorConfig="Edit Pacman Mirror Configuration"
+_MirrorPacman="Edit Pacman Configuration"
 _MIrrorPacQ="\nUse edited pacman configuration for installed system? If Yes, the file will be copied over after installing the base.\n\n"

 # Set Keymap (vconsole)
--- a/translations/french.trans
+++ b/translations/french.trans
@ -133,6 +133,7 @@ _MirrorRankBody="\nRecherche des serveurs les plus rapides appartenant à la lis
 _MirrorNoneBody="\nLa copie de la liste originale des miroirs est introuvable.\n\n"
 _MirrorCntryBody="\nLa liste des miroirs sélectionnés par pays va être générée.\n"
 _MirrorGenQ="Utiliser la liste des miroirs générée ?"
+_MirrorConfig="Éditer la configuration de pacman miroirs"
 _MirrorPacman="Éditer la configuration de pacman"
 _MIrrorPacQ="\nUtiliser la configuration modifiée de pacman pour le système installé ? Si Oui, le fichier sera copié après l'installation de la base.\n\n"

--- a/translations/hungarian.trans
+++ b/translations/hungarian.trans
@ -133,6 +133,7 @@ _MirrorRankBody="\nA leggyorsabb szerver megkeresése a tükörlistából."
 _MirrorNoneBody="\nAz eredeti tükörlista másolata nem található.\n\n"
 _MirrorCntryBody="\nA választott ország szerinti listát létrehoztam.\n"
 _MirrorGenQ="A létrehozott tükörlistát használja a telepítő?"
+_MirrorConfig="'Pacman Mirror' konfiguráció szerkesztése"
 _MirrorPacman="'Pacman' konfiguráció szerkesztése"
 _MIrrorPacQ="\nHasználod a szerkesztett 'pacman' beállítást a telepített rendszerre? Ha igen, akkor a fájlt átmásoljuk az alaptelepítés után\n\n"

--- a/translations/italian.trans
+++ b/translations/italian.trans
@ -133,6 +133,7 @@ _MirrorRankBody="\nRicerca server più veloce nella lista mirror."
 _MirrorNoneBody="\nUna copia della lista dei mirror originale non è stata trovata.\n\n"
 _MirrorCntryBody="\nSarà generata una lista mirror per la località selezionata.\n"
 _MirrorGenQ="Vuoi usare la lista creata per l'installazione?"
+_MirrorConfig="Modifica configurazione Pacman Mirror"
 _MirrorPacman="Modifica configurazione pacman"
 _MIrrorPacQ="\nUsare la configurazione pacman modificata per il sistema installato? Se sì, il file verrà copiato dopo l'installazione di base.\n\n"

--- a/translations/portuguese.trans
+++ b/translations/portuguese.trans
@ -133,6 +133,7 @@ _MirrorRankBody="\nEncontrar os mais rápidos servidores do mirrorlist."
 _MirrorNoneBody="\nUma cópia mirrorlist original não foi encontrado.\n\n"
 _MirrorCntryBody="\nSerá gerada a lista mirrors do país seleccionado.\n"
 _MirrorGenQ="Use gerar mirrorlist para o instalador?"
+_MirrorConfig="Editar configuração do Pacman Mirror"
 _MirrorPacman="Editar configuração do pacman"
 _MIrrorPacQ="\nUtilizar o arquivo de configuração editado do pacman para o sistema instalado? Se Sim, o arquivo será copiado após a instalação do sistema base.\n\n"

--- a/translations/portuguese_brasil.trans
+++ b/translations/portuguese_brasil.trans
@ -133,6 +133,7 @@ _MirrorRankBody="\nPesquisando os servidores rápidos da lista de espelho."
 _MirrorNoneBody="\nUma cópia da lista de espelhos original não foi encontrada.\n\n"
 _MirrorCntryBody="\nSerá gerada a lista de espelhos do país selecionado.\n"
 _MirrorGenQ="Usar a lista de espelhos gerada para o instalador?"
+_MirrorConfig="Editar configuração do pacman espelhos"
 _MirrorPacman="Editar configuração do pacman"
 _MIrrorPacQ="\nUtilizar o arquivo de configuração editado do pacman para o sistema instalado? Se Sim, o arquivo será copiado após a instalação do sistema base.\n\n"

--- a/translations/russian.trans
+++ b/translations/russian.trans
@ -133,6 +133,7 @@ _MirrorRankBody="\nПоиск самого быстрого сервера из
 _MirrorNoneBody="\nКопия оригинального списка зеркал не найдена.\n\n"
 _MirrorCntryBody="\nСписок зеркал будет сгенерирован по выбранной стране.\n"
 _MirrorGenQ="Использовать сгенерированный список зеркал в установщике?"
+_MirrorConfig="Редактировать конф. файл pacman зеркал"
 _MirrorPacman="Редактировать конф. файл pacman"
 _MIrrorPacQ="\nИспользовать отредактированный конфигурационный файл pacman в установленной системе? Если Да, файл будет скопирован после установки системной базы.\n\n"

--- a/translations/spanish.trans
+++ b/translations/spanish.trans
@ -133,6 +133,7 @@ _MirrorRankBody="\nBuscando los servidores más rápidos de la lista de mirrors.
 _MirrorNoneBody="\nSe ha encontrado una copia de la lista original de mirrors.\n\n"
 _MirrorCntryBody="\nSe generará una lista de mirrors por el país seleccionado.\n"
 _MirrorGenQ="¿Usar la lista de mirrors generada para el instalador?"
+_MirrorConfig="Editar configuración de pacman mirrors"
 _MirrorPacman="Editar configuración de pacman"
 _MIrrorPacQ="\n¿Utilizar el archivo de configuración de 'pacman' editado para el sistema instalado? Si elige si, el archivo se copiará después de instalar el sistema base.\n\n"