From 6ffa459c7fbcacdf9004a38f00f1223aea9c8505 Mon Sep 17 00:00:00 2001 From: herobrauni Date: Wed, 16 Oct 2019 08:49:55 +0200 Subject: [PATCH 1/4] removed fetchmirrs, renamed variable to "update_mirrors" --- etc/anarchy.conf | 4 ++-- etc/issue_cli | 1 - extra/.help | 1 - extra/.helprc | 1 - iso-generator.sh | 4 +--- lang/anarchy-bulgarian.conf | 2 +- lang/anarchy-dutch.conf | 2 +- lang/anarchy-english.conf | 2 +- lang/anarchy-french.conf | 2 +- lang/anarchy-german.conf | 2 +- lang/anarchy-greek.conf | 2 +- lang/anarchy-hungarian.conf | 2 +- lang/anarchy-indonesia.conf | 2 +- lang/anarchy-italian.conf | 2 +- lang/anarchy-latvian.conf | 2 +- lang/anarchy-lithuanian.conf | 2 +- lang/anarchy-polish.conf | 2 +- lang/anarchy-portuguese-br.conf | 2 +- lang/anarchy-portuguese.conf | 2 +- lang/anarchy-romanian.conf | 2 +- lang/anarchy-russian.conf | 2 +- lang/anarchy-spanish.conf | 2 +- lang/anarchy-swedish.conf | 2 +- lib/configure_connection.sh | 4 ++-- 24 files changed, 23 insertions(+), 28 deletions(-) diff --git a/etc/anarchy.conf b/etc/anarchy.conf index 62665f84..61785b3f 100644 --- a/etc/anarchy.conf +++ b/etc/anarchy.conf @@ -122,7 +122,7 @@ config() { -u|--update) tmp_dir=$(mktemp -d) echo -ne "\n${Yellow}*> Anarchy: Downloading..." - wget -q -4 --no-check-certificate -O ${tmp_dir}/master.tar.gz https://github.com/AnarchyLinux/installer/archive/master.tar.gz + wget -q -4 --no-check-certificate -O ${tmp_dir}/master.tar.gz https://github.com/herobrauni/installer/archive/master.tar.gz if [ "$?" -gt "0" ]; then echo -e "${Red}*> Error: ${Yellow}Active network connection not detected - Please connect to the internet and try again. Exiting..." exit 2 @@ -175,7 +175,7 @@ config() { # Desktop packages de_defaults="xdg-user-dirs xorg-server xorg-apps xorg-xinit xterm ttf-dejavu gvfs gvfs-smb gvfs-mtp pulseaudio pavucontrol pulseaudio-alsa alsa-utils unzip yay" - extras="gvfs arc-gtk-theme elementary-icon-theme numix-icon-theme-git numix-circle-icon-theme-git htop lynx fetchmirrors chromium libreoffice-fresh vlc gnome-packagekit pantheon-music yay" + extras="gvfs arc-gtk-theme elementary-icon-theme numix-icon-theme-git numix-circle-icon-theme-git htop lynx chromium libreoffice-fresh vlc gnome-packagekit pantheon-music yay" # Graphics Drivers gr1="Vesa ${os} $drivers" diff --git a/etc/issue_cli b/etc/issue_cli index 977fefb2..9f521294 100644 --- a/etc/issue_cli +++ b/etc/issue_cli @@ -15,7 +15,6 @@  | 2.) Anarchy Update - anarchy -u |  | 3.) Connection Test - iptest |  | 4.) System Information - sysinfo | - | 5.) Update Mirrorlist - fetchmirrors |  | |  | For more info on Anarchy Linux type: help OR: anarchy --help |  | To show this screen at any time type: start | diff --git a/extra/.help b/extra/.help index c9d4d73c..3063b22e 100644 --- a/extra/.help +++ b/extra/.help @@ -4,7 +4,6 @@  To begin the automated installer simply type and press enter: anarchy  You can check the status of your connection with the command: iptest - If you wish to update your mirrorlist you may do so with: fetchmirrors  View a detailed list of system info with the command: sysinfo  Any questions, comments, suggestions, or bug reports may be sent to the developer: diff --git a/extra/.helprc b/extra/.helprc index cf03a2f0..6172cb4f 100644 --- a/extra/.helprc +++ b/extra/.helprc @@ -4,5 +4,4 @@ alias 1="anarchy" alias 2="anarchy -u" alias 3="iptest" alias 4="sysinfo" -alias 5="fetchmirrors" cat /etc/issue_cli diff --git a/iso-generator.sh b/iso-generator.sh index 700b2636..4d7da49d 100755 --- a/iso-generator.sh +++ b/iso-generator.sh @@ -109,7 +109,6 @@ init() { # Packages to add to local repo local_aur_packages=( # prev: builds - 'fetchmirrors' 'numix-icon-theme-git' 'numix-circle-icon-theme-git' 'oh-my-zsh-git' @@ -474,9 +473,8 @@ copy_config_files() { # prev: build_conf build_system() { # prev: build_sys echo -e "Installing packages to new system ..." | log - # Install fonts, fbterm, fetchmirrors etc. + # Install fonts, fbterm etc. sudo pacman --root "${squashfs}" --cachedir "${squashfs}"/var/cache/pacman/pkg --config "${pacman_config}" --noconfirm -Sy terminus-font acpi zsh-syntax-highlighting pacman-contrib - sudo pacman --root "${squashfs}" --cachedir "${squashfs}"/var/cache/pacman/pkg --config "${pacman_config}" --noconfirm -U /tmp/fetchmirrors/*.pkg.tar.xz sudo pacman --root "${squashfs}" --cachedir "${squashfs}"/var/cache/pacman/pkg --config "${pacman_config}" -Sl | awk '/\[installed\]$/ {print $1 "/" $2 "-" $3}' > "${custom_iso}"/arch/pkglist."${system_architecture}".txt sudo pacman --root "${squashfs}" --cachedir "${squashfs}"/var/cache/pacman/pkg --config "${pacman_config}" --noconfirm -Scc sudo rm -f "${squashfs}"/var/cache/pacman/pkg/* diff --git a/lang/anarchy-bulgarian.conf b/lang/anarchy-bulgarian.conf index b137ad70..69bc676a 100644 --- a/lang/anarchy-bulgarian.conf +++ b/lang/anarchy-bulgarian.conf @@ -49,7 +49,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-dutch.conf b/lang/anarchy-dutch.conf index 0c25e1ef..7fded132 100644 --- a/lang/anarchy-dutch.conf +++ b/lang/anarchy-dutch.conf @@ -53,7 +53,7 @@ mirror_editor_msg="Selecteer een tekst editor om de mirrors te veranderen:" manual_mirrors="Verander MirrorList Handmatig" -fetchmirrors="Download & Rank Nieuwe Mirrors" +update_mirrors="Download & Rank Nieuwe Mirrors" cancel_mirrors="Sla Mirror Update Over" diff --git a/lang/anarchy-english.conf b/lang/anarchy-english.conf index cbd4bded..b69d0e76 100644 --- a/lang/anarchy-english.conf +++ b/lang/anarchy-english.conf @@ -183,7 +183,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-french.conf b/lang/anarchy-french.conf index 37c68d8b..ed701396 100644 --- a/lang/anarchy-french.conf +++ b/lang/anarchy-french.conf @@ -443,7 +443,7 @@ mirror_editor_msg="Sélectionnez un éditeur de texte pour éditer les miroirs : manual_mirrors="Éditer la liste des miroirs à la main" -fetchmirrors="Télécharger et trier les nouveaux miroirs" +update_mirrors="Télécharger et trier les nouveaux miroirs" cancel_mirrors="Sauter la mise à jour des miroirs" diff --git a/lang/anarchy-german.conf b/lang/anarchy-german.conf index 82bbbda9..e9854dfc 100644 --- a/lang/anarchy-german.conf +++ b/lang/anarchy-german.conf @@ -190,7 +190,7 @@ mirror_editor_msg="Texteditor zum #ndern der Spiegelserverliste auswählen:" manual_mirrors="Spiegelserverliste manuell ändern" -fetchmirrors="Spiegelserverlisten neu bewerten und aktualisieren" +update_mirrors="Spiegelserverlisten neu bewerten und aktualisieren" cancel_mirrors="Aktualisierung der Spiegelserver überspringen" diff --git a/lang/anarchy-greek.conf b/lang/anarchy-greek.conf index f850a8bd..edb4cc25 100644 --- a/lang/anarchy-greek.conf +++ b/lang/anarchy-greek.conf @@ -62,7 +62,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-hungarian.conf b/lang/anarchy-hungarian.conf index 7b21b0e3..b5940f21 100644 --- a/lang/anarchy-hungarian.conf +++ b/lang/anarchy-hungarian.conf @@ -49,7 +49,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-indonesia.conf b/lang/anarchy-indonesia.conf index a977de6b..bc2bc8d4 100644 --- a/lang/anarchy-indonesia.conf +++ b/lang/anarchy-indonesia.conf @@ -59,7 +59,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-italian.conf b/lang/anarchy-italian.conf index c20f0e64..bd2fb6f7 100644 --- a/lang/anarchy-italian.conf +++ b/lang/anarchy-italian.conf @@ -55,7 +55,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-latvian.conf b/lang/anarchy-latvian.conf index f27f717c..40c465ec 100644 --- a/lang/anarchy-latvian.conf +++ b/lang/anarchy-latvian.conf @@ -53,7 +53,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-lithuanian.conf b/lang/anarchy-lithuanian.conf index 762cee2c..f1dfdaf7 100644 --- a/lang/anarchy-lithuanian.conf +++ b/lang/anarchy-lithuanian.conf @@ -53,7 +53,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-polish.conf b/lang/anarchy-polish.conf index 27c0cb7c..e94ee672 100644 --- a/lang/anarchy-polish.conf +++ b/lang/anarchy-polish.conf @@ -188,7 +188,7 @@ mirror_editor_msg="Wybierz edytor tekstu do edycji serwerów lustrzanych:" manual_mirrors="Edytuj manualnie listę serwerów lustrzanych" -fetchmirrors="Pobierz i Sortuj nowe serwery lustrzane" +update_mirrors="Pobierz i Sortuj nowe serwery lustrzane" cancel_mirrors="Pomiń aktualizację serwerów lustrzanych" diff --git a/lang/anarchy-portuguese-br.conf b/lang/anarchy-portuguese-br.conf index 2189994d..1db9b870 100644 --- a/lang/anarchy-portuguese-br.conf +++ b/lang/anarchy-portuguese-br.conf @@ -200,7 +200,7 @@ mirror_editor_msg="Selecione um editor de texto para editar os espelhos:" manual_mirrors="Editar lista de espelhos manualmente" -fetchmirrors="Baixar & Ordernar novos espelhos" +update_mirrors="Baixar & Ordernar novos espelhos" cancel_mirrors="Pular atualização do espelho" diff --git a/lang/anarchy-portuguese.conf b/lang/anarchy-portuguese.conf index 1ac45839..449af1ba 100644 --- a/lang/anarchy-portuguese.conf +++ b/lang/anarchy-portuguese.conf @@ -106,7 +106,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-romanian.conf b/lang/anarchy-romanian.conf index e30b6207..c832f1f6 100644 --- a/lang/anarchy-romanian.conf +++ b/lang/anarchy-romanian.conf @@ -183,7 +183,7 @@ mirror_editor_msg="Selectați un editor pentru a edita lista mirror:" manual_mirrors="Editați manual lista mirror" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Omiteți actualizarea listei mirror" diff --git a/lang/anarchy-russian.conf b/lang/anarchy-russian.conf index 5b52fafd..2c62c31a 100644 --- a/lang/anarchy-russian.conf +++ b/lang/anarchy-russian.conf @@ -48,7 +48,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-spanish.conf b/lang/anarchy-spanish.conf index 108f152d..f04a4ef0 100644 --- a/lang/anarchy-spanish.conf +++ b/lang/anarchy-spanish.conf @@ -187,7 +187,7 @@ mirror_editor_msg="Selecciona un editor de texto para editar las réplicas:" manual_mirrors="Editar lista de réplicas manualmente" -fetchmirrors="Descargar y seleccionar réplicas" +update_mirrors="Descargar y seleccionar réplicas" cancel_mirrors="Saltar actualización de réplicas" diff --git a/lang/anarchy-swedish.conf b/lang/anarchy-swedish.conf index 4ad895af..d5c27ec7 100644 --- a/lang/anarchy-swedish.conf +++ b/lang/anarchy-swedish.conf @@ -79,7 +79,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lib/configure_connection.sh b/lib/configure_connection.sh index 37db0f3a..e6537f5b 100644 --- a/lib/configure_connection.sh +++ b/lib/configure_connection.sh @@ -54,7 +54,7 @@ update_mirrors() { while (true) do edit_mirrors=$(dialog --ok-button "$ok" --menu "\n$mirror_msg0\n" 12 60 3 \ - "$fetchmirrors" "->" \ + "$update_mirrors" "->" \ "$manual_mirrors" "->" \ "$cancel_mirrors" "->" 3>&1 1>&2 2>&3) if [ "$?" -gt "0" ] || [ "$edit_mirrors" == "$cancel_mirrors" ]; then @@ -64,7 +64,7 @@ update_mirrors() { fi case "$edit_mirrors" in - "$fetchmirrors") + "$update_mirrors") code=$(dialog --ok-button "$ok" --menu "$mirror_msg1" 17 60 10 \ "$default" "->" \ $countries 3>&1 1>&2 2>&3) From f3f0b299f9f26d60b6858722596fadb984390dd7 Mon Sep 17 00:00:00 2001 From: herobrauni Date: Wed, 16 Oct 2019 09:20:22 +0200 Subject: [PATCH 2/4] removed fetchmirrs, renamed variable to "update_mirrors" --- etc/issue_cli | 1 - extra/.help | 1 - extra/.helprc | 1 - iso-generator.sh | 4 +--- lang/anarchy-bulgarian.conf | 2 +- lang/anarchy-dutch.conf | 2 +- lang/anarchy-english.conf | 2 +- lang/anarchy-french.conf | 2 +- lang/anarchy-german.conf | 2 +- lang/anarchy-greek.conf | 2 +- lang/anarchy-hungarian.conf | 2 +- lang/anarchy-indonesia.conf | 2 +- lang/anarchy-italian.conf | 2 +- lang/anarchy-latvian.conf | 2 +- lang/anarchy-lithuanian.conf | 2 +- lang/anarchy-polish.conf | 2 +- lang/anarchy-portuguese-br.conf | 2 +- lang/anarchy-portuguese.conf | 2 +- lang/anarchy-romanian.conf | 2 +- lang/anarchy-russian.conf | 2 +- lang/anarchy-spanish.conf | 2 +- lang/anarchy-swedish.conf | 2 +- lib/configure_connection.sh | 4 ++-- 23 files changed, 21 insertions(+), 26 deletions(-) diff --git a/etc/issue_cli b/etc/issue_cli index 977fefb2..9f521294 100644 --- a/etc/issue_cli +++ b/etc/issue_cli @@ -15,7 +15,6 @@  | 2.) Anarchy Update - anarchy -u |  | 3.) Connection Test - iptest |  | 4.) System Information - sysinfo | - | 5.) Update Mirrorlist - fetchmirrors |  | |  | For more info on Anarchy Linux type: help OR: anarchy --help |  | To show this screen at any time type: start | diff --git a/extra/.help b/extra/.help index c9d4d73c..3063b22e 100644 --- a/extra/.help +++ b/extra/.help @@ -4,7 +4,6 @@  To begin the automated installer simply type and press enter: anarchy  You can check the status of your connection with the command: iptest - If you wish to update your mirrorlist you may do so with: fetchmirrors  View a detailed list of system info with the command: sysinfo  Any questions, comments, suggestions, or bug reports may be sent to the developer: diff --git a/extra/.helprc b/extra/.helprc index cf03a2f0..6172cb4f 100644 --- a/extra/.helprc +++ b/extra/.helprc @@ -4,5 +4,4 @@ alias 1="anarchy" alias 2="anarchy -u" alias 3="iptest" alias 4="sysinfo" -alias 5="fetchmirrors" cat /etc/issue_cli diff --git a/iso-generator.sh b/iso-generator.sh index 700b2636..4d7da49d 100755 --- a/iso-generator.sh +++ b/iso-generator.sh @@ -109,7 +109,6 @@ init() { # Packages to add to local repo local_aur_packages=( # prev: builds - 'fetchmirrors' 'numix-icon-theme-git' 'numix-circle-icon-theme-git' 'oh-my-zsh-git' @@ -474,9 +473,8 @@ copy_config_files() { # prev: build_conf build_system() { # prev: build_sys echo -e "Installing packages to new system ..." | log - # Install fonts, fbterm, fetchmirrors etc. + # Install fonts, fbterm etc. sudo pacman --root "${squashfs}" --cachedir "${squashfs}"/var/cache/pacman/pkg --config "${pacman_config}" --noconfirm -Sy terminus-font acpi zsh-syntax-highlighting pacman-contrib - sudo pacman --root "${squashfs}" --cachedir "${squashfs}"/var/cache/pacman/pkg --config "${pacman_config}" --noconfirm -U /tmp/fetchmirrors/*.pkg.tar.xz sudo pacman --root "${squashfs}" --cachedir "${squashfs}"/var/cache/pacman/pkg --config "${pacman_config}" -Sl | awk '/\[installed\]$/ {print $1 "/" $2 "-" $3}' > "${custom_iso}"/arch/pkglist."${system_architecture}".txt sudo pacman --root "${squashfs}" --cachedir "${squashfs}"/var/cache/pacman/pkg --config "${pacman_config}" --noconfirm -Scc sudo rm -f "${squashfs}"/var/cache/pacman/pkg/* diff --git a/lang/anarchy-bulgarian.conf b/lang/anarchy-bulgarian.conf index b137ad70..69bc676a 100644 --- a/lang/anarchy-bulgarian.conf +++ b/lang/anarchy-bulgarian.conf @@ -49,7 +49,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-dutch.conf b/lang/anarchy-dutch.conf index 0c25e1ef..7fded132 100644 --- a/lang/anarchy-dutch.conf +++ b/lang/anarchy-dutch.conf @@ -53,7 +53,7 @@ mirror_editor_msg="Selecteer een tekst editor om de mirrors te veranderen:" manual_mirrors="Verander MirrorList Handmatig" -fetchmirrors="Download & Rank Nieuwe Mirrors" +update_mirrors="Download & Rank Nieuwe Mirrors" cancel_mirrors="Sla Mirror Update Over" diff --git a/lang/anarchy-english.conf b/lang/anarchy-english.conf index cbd4bded..b69d0e76 100644 --- a/lang/anarchy-english.conf +++ b/lang/anarchy-english.conf @@ -183,7 +183,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-french.conf b/lang/anarchy-french.conf index 37c68d8b..ed701396 100644 --- a/lang/anarchy-french.conf +++ b/lang/anarchy-french.conf @@ -443,7 +443,7 @@ mirror_editor_msg="Sélectionnez un éditeur de texte pour éditer les miroirs : manual_mirrors="Éditer la liste des miroirs à la main" -fetchmirrors="Télécharger et trier les nouveaux miroirs" +update_mirrors="Télécharger et trier les nouveaux miroirs" cancel_mirrors="Sauter la mise à jour des miroirs" diff --git a/lang/anarchy-german.conf b/lang/anarchy-german.conf index 82bbbda9..e9854dfc 100644 --- a/lang/anarchy-german.conf +++ b/lang/anarchy-german.conf @@ -190,7 +190,7 @@ mirror_editor_msg="Texteditor zum #ndern der Spiegelserverliste auswählen:" manual_mirrors="Spiegelserverliste manuell ändern" -fetchmirrors="Spiegelserverlisten neu bewerten und aktualisieren" +update_mirrors="Spiegelserverlisten neu bewerten und aktualisieren" cancel_mirrors="Aktualisierung der Spiegelserver überspringen" diff --git a/lang/anarchy-greek.conf b/lang/anarchy-greek.conf index f850a8bd..edb4cc25 100644 --- a/lang/anarchy-greek.conf +++ b/lang/anarchy-greek.conf @@ -62,7 +62,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-hungarian.conf b/lang/anarchy-hungarian.conf index 7b21b0e3..b5940f21 100644 --- a/lang/anarchy-hungarian.conf +++ b/lang/anarchy-hungarian.conf @@ -49,7 +49,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-indonesia.conf b/lang/anarchy-indonesia.conf index a977de6b..bc2bc8d4 100644 --- a/lang/anarchy-indonesia.conf +++ b/lang/anarchy-indonesia.conf @@ -59,7 +59,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-italian.conf b/lang/anarchy-italian.conf index c20f0e64..bd2fb6f7 100644 --- a/lang/anarchy-italian.conf +++ b/lang/anarchy-italian.conf @@ -55,7 +55,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-latvian.conf b/lang/anarchy-latvian.conf index f27f717c..40c465ec 100644 --- a/lang/anarchy-latvian.conf +++ b/lang/anarchy-latvian.conf @@ -53,7 +53,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-lithuanian.conf b/lang/anarchy-lithuanian.conf index 762cee2c..f1dfdaf7 100644 --- a/lang/anarchy-lithuanian.conf +++ b/lang/anarchy-lithuanian.conf @@ -53,7 +53,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-polish.conf b/lang/anarchy-polish.conf index 27c0cb7c..e94ee672 100644 --- a/lang/anarchy-polish.conf +++ b/lang/anarchy-polish.conf @@ -188,7 +188,7 @@ mirror_editor_msg="Wybierz edytor tekstu do edycji serwerów lustrzanych:" manual_mirrors="Edytuj manualnie listę serwerów lustrzanych" -fetchmirrors="Pobierz i Sortuj nowe serwery lustrzane" +update_mirrors="Pobierz i Sortuj nowe serwery lustrzane" cancel_mirrors="Pomiń aktualizację serwerów lustrzanych" diff --git a/lang/anarchy-portuguese-br.conf b/lang/anarchy-portuguese-br.conf index 2189994d..1db9b870 100644 --- a/lang/anarchy-portuguese-br.conf +++ b/lang/anarchy-portuguese-br.conf @@ -200,7 +200,7 @@ mirror_editor_msg="Selecione um editor de texto para editar os espelhos:" manual_mirrors="Editar lista de espelhos manualmente" -fetchmirrors="Baixar & Ordernar novos espelhos" +update_mirrors="Baixar & Ordernar novos espelhos" cancel_mirrors="Pular atualização do espelho" diff --git a/lang/anarchy-portuguese.conf b/lang/anarchy-portuguese.conf index 1ac45839..449af1ba 100644 --- a/lang/anarchy-portuguese.conf +++ b/lang/anarchy-portuguese.conf @@ -106,7 +106,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-romanian.conf b/lang/anarchy-romanian.conf index e30b6207..c832f1f6 100644 --- a/lang/anarchy-romanian.conf +++ b/lang/anarchy-romanian.conf @@ -183,7 +183,7 @@ mirror_editor_msg="Selectați un editor pentru a edita lista mirror:" manual_mirrors="Editați manual lista mirror" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Omiteți actualizarea listei mirror" diff --git a/lang/anarchy-russian.conf b/lang/anarchy-russian.conf index 5b52fafd..2c62c31a 100644 --- a/lang/anarchy-russian.conf +++ b/lang/anarchy-russian.conf @@ -48,7 +48,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-spanish.conf b/lang/anarchy-spanish.conf index 108f152d..f04a4ef0 100644 --- a/lang/anarchy-spanish.conf +++ b/lang/anarchy-spanish.conf @@ -187,7 +187,7 @@ mirror_editor_msg="Selecciona un editor de texto para editar las réplicas:" manual_mirrors="Editar lista de réplicas manualmente" -fetchmirrors="Descargar y seleccionar réplicas" +update_mirrors="Descargar y seleccionar réplicas" cancel_mirrors="Saltar actualización de réplicas" diff --git a/lang/anarchy-swedish.conf b/lang/anarchy-swedish.conf index 4ad895af..d5c27ec7 100644 --- a/lang/anarchy-swedish.conf +++ b/lang/anarchy-swedish.conf @@ -79,7 +79,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -fetchmirrors="Download & Rank New Mirrors" +update_mirrors="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lib/configure_connection.sh b/lib/configure_connection.sh index 37db0f3a..e6537f5b 100644 --- a/lib/configure_connection.sh +++ b/lib/configure_connection.sh @@ -54,7 +54,7 @@ update_mirrors() { while (true) do edit_mirrors=$(dialog --ok-button "$ok" --menu "\n$mirror_msg0\n" 12 60 3 \ - "$fetchmirrors" "->" \ + "$update_mirrors" "->" \ "$manual_mirrors" "->" \ "$cancel_mirrors" "->" 3>&1 1>&2 2>&3) if [ "$?" -gt "0" ] || [ "$edit_mirrors" == "$cancel_mirrors" ]; then @@ -64,7 +64,7 @@ update_mirrors() { fi case "$edit_mirrors" in - "$fetchmirrors") + "$update_mirrors") code=$(dialog --ok-button "$ok" --menu "$mirror_msg1" 17 60 10 \ "$default" "->" \ $countries 3>&1 1>&2 2>&3) From dd4abfbf996948d51f5d58b869a9adc47f31d4f5 Mon Sep 17 00:00:00 2001 From: herobrauni Date: Wed, 16 Oct 2019 09:22:57 +0200 Subject: [PATCH 3/4] changed url back to AnarchyLinux --- etc/anarchy.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/anarchy.conf b/etc/anarchy.conf index 61785b3f..ff267059 100644 --- a/etc/anarchy.conf +++ b/etc/anarchy.conf @@ -122,7 +122,7 @@ config() { -u|--update) tmp_dir=$(mktemp -d) echo -ne "\n${Yellow}*> Anarchy: Downloading..." - wget -q -4 --no-check-certificate -O ${tmp_dir}/master.tar.gz https://github.com/herobrauni/installer/archive/master.tar.gz + wget -q -4 --no-check-certificate -O ${tmp_dir}/master.tar.gz https://github.com/AnarchyLinux/installer/archive/master.tar.gz if [ "$?" -gt "0" ]; then echo -e "${Red}*> Error: ${Yellow}Active network connection not detected - Please connect to the internet and try again. Exiting..." exit 2 From 14c8ef011b7544e3d80218e298e9c41b4325196e Mon Sep 17 00:00:00 2001 From: herobrauni Date: Wed, 16 Oct 2019 10:06:42 +0200 Subject: [PATCH 4/4] Changed message variable from "update_mirrors" to "update_mirrors_msg" to avoid duplicate with the function "update_mirrors" --- lang/anarchy-bulgarian.conf | 2 +- lang/anarchy-dutch.conf | 2 +- lang/anarchy-english.conf | 2 +- lang/anarchy-french.conf | 2 +- lang/anarchy-german.conf | 2 +- lang/anarchy-greek.conf | 2 +- lang/anarchy-hungarian.conf | 2 +- lang/anarchy-indonesia.conf | 2 +- lang/anarchy-italian.conf | 2 +- lang/anarchy-latvian.conf | 2 +- lang/anarchy-lithuanian.conf | 2 +- lang/anarchy-polish.conf | 2 +- lang/anarchy-portuguese-br.conf | 2 +- lang/anarchy-portuguese.conf | 2 +- lang/anarchy-romanian.conf | 2 +- lang/anarchy-russian.conf | 2 +- lang/anarchy-spanish.conf | 2 +- lang/anarchy-swedish.conf | 2 +- lib/configure_connection.sh | 4 ++-- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lang/anarchy-bulgarian.conf b/lang/anarchy-bulgarian.conf index 69bc676a..15c5a432 100644 --- a/lang/anarchy-bulgarian.conf +++ b/lang/anarchy-bulgarian.conf @@ -49,7 +49,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -update_mirrors="Download & Rank New Mirrors" +update_mirrors_msg="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-dutch.conf b/lang/anarchy-dutch.conf index 7fded132..5d91d3e9 100644 --- a/lang/anarchy-dutch.conf +++ b/lang/anarchy-dutch.conf @@ -53,7 +53,7 @@ mirror_editor_msg="Selecteer een tekst editor om de mirrors te veranderen:" manual_mirrors="Verander MirrorList Handmatig" -update_mirrors="Download & Rank Nieuwe Mirrors" +update_mirrors_msg="Download & Rank Nieuwe Mirrors" cancel_mirrors="Sla Mirror Update Over" diff --git a/lang/anarchy-english.conf b/lang/anarchy-english.conf index b69d0e76..640d0400 100644 --- a/lang/anarchy-english.conf +++ b/lang/anarchy-english.conf @@ -183,7 +183,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -update_mirrors="Download & Rank New Mirrors" +update_mirrors_msg="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-french.conf b/lang/anarchy-french.conf index ed701396..ba7f0f92 100644 --- a/lang/anarchy-french.conf +++ b/lang/anarchy-french.conf @@ -443,7 +443,7 @@ mirror_editor_msg="Sélectionnez un éditeur de texte pour éditer les miroirs : manual_mirrors="Éditer la liste des miroirs à la main" -update_mirrors="Télécharger et trier les nouveaux miroirs" +update_mirrors_msg="Télécharger et trier les nouveaux miroirs" cancel_mirrors="Sauter la mise à jour des miroirs" diff --git a/lang/anarchy-german.conf b/lang/anarchy-german.conf index e9854dfc..a0381a2f 100644 --- a/lang/anarchy-german.conf +++ b/lang/anarchy-german.conf @@ -190,7 +190,7 @@ mirror_editor_msg="Texteditor zum #ndern der Spiegelserverliste auswählen:" manual_mirrors="Spiegelserverliste manuell ändern" -update_mirrors="Spiegelserverlisten neu bewerten und aktualisieren" +update_mirrors_msg="Spiegelserverlisten neu bewerten und aktualisieren" cancel_mirrors="Aktualisierung der Spiegelserver überspringen" diff --git a/lang/anarchy-greek.conf b/lang/anarchy-greek.conf index edb4cc25..d0a7e3e1 100644 --- a/lang/anarchy-greek.conf +++ b/lang/anarchy-greek.conf @@ -62,7 +62,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -update_mirrors="Download & Rank New Mirrors" +update_mirrors_msg="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-hungarian.conf b/lang/anarchy-hungarian.conf index b5940f21..10f8e9f6 100644 --- a/lang/anarchy-hungarian.conf +++ b/lang/anarchy-hungarian.conf @@ -49,7 +49,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -update_mirrors="Download & Rank New Mirrors" +update_mirrors_msg="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-indonesia.conf b/lang/anarchy-indonesia.conf index bc2bc8d4..1ad4312c 100644 --- a/lang/anarchy-indonesia.conf +++ b/lang/anarchy-indonesia.conf @@ -59,7 +59,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -update_mirrors="Download & Rank New Mirrors" +update_mirrors_msg="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-italian.conf b/lang/anarchy-italian.conf index bd2fb6f7..c3a46668 100644 --- a/lang/anarchy-italian.conf +++ b/lang/anarchy-italian.conf @@ -55,7 +55,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -update_mirrors="Download & Rank New Mirrors" +update_mirrors_msg="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-latvian.conf b/lang/anarchy-latvian.conf index 40c465ec..37007bbb 100644 --- a/lang/anarchy-latvian.conf +++ b/lang/anarchy-latvian.conf @@ -53,7 +53,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -update_mirrors="Download & Rank New Mirrors" +update_mirrors_msg="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-lithuanian.conf b/lang/anarchy-lithuanian.conf index f1dfdaf7..af96f721 100644 --- a/lang/anarchy-lithuanian.conf +++ b/lang/anarchy-lithuanian.conf @@ -53,7 +53,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -update_mirrors="Download & Rank New Mirrors" +update_mirrors_msg="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-polish.conf b/lang/anarchy-polish.conf index e94ee672..11de4c84 100644 --- a/lang/anarchy-polish.conf +++ b/lang/anarchy-polish.conf @@ -188,7 +188,7 @@ mirror_editor_msg="Wybierz edytor tekstu do edycji serwerów lustrzanych:" manual_mirrors="Edytuj manualnie listę serwerów lustrzanych" -update_mirrors="Pobierz i Sortuj nowe serwery lustrzane" +update_mirrors_msg="Pobierz i Sortuj nowe serwery lustrzane" cancel_mirrors="Pomiń aktualizację serwerów lustrzanych" diff --git a/lang/anarchy-portuguese-br.conf b/lang/anarchy-portuguese-br.conf index 1db9b870..a196e3ae 100644 --- a/lang/anarchy-portuguese-br.conf +++ b/lang/anarchy-portuguese-br.conf @@ -200,7 +200,7 @@ mirror_editor_msg="Selecione um editor de texto para editar os espelhos:" manual_mirrors="Editar lista de espelhos manualmente" -update_mirrors="Baixar & Ordernar novos espelhos" +update_mirrors_msg="Baixar & Ordernar novos espelhos" cancel_mirrors="Pular atualização do espelho" diff --git a/lang/anarchy-portuguese.conf b/lang/anarchy-portuguese.conf index 449af1ba..c9e4164b 100644 --- a/lang/anarchy-portuguese.conf +++ b/lang/anarchy-portuguese.conf @@ -106,7 +106,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -update_mirrors="Download & Rank New Mirrors" +update_mirrors_msg="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-romanian.conf b/lang/anarchy-romanian.conf index c832f1f6..a7de7927 100644 --- a/lang/anarchy-romanian.conf +++ b/lang/anarchy-romanian.conf @@ -183,7 +183,7 @@ mirror_editor_msg="Selectați un editor pentru a edita lista mirror:" manual_mirrors="Editați manual lista mirror" -update_mirrors="Download & Rank New Mirrors" +update_mirrors_msg="Download & Rank New Mirrors" cancel_mirrors="Omiteți actualizarea listei mirror" diff --git a/lang/anarchy-russian.conf b/lang/anarchy-russian.conf index 2c62c31a..9afaa1d6 100644 --- a/lang/anarchy-russian.conf +++ b/lang/anarchy-russian.conf @@ -48,7 +48,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -update_mirrors="Download & Rank New Mirrors" +update_mirrors_msg="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lang/anarchy-spanish.conf b/lang/anarchy-spanish.conf index f04a4ef0..dcb06259 100644 --- a/lang/anarchy-spanish.conf +++ b/lang/anarchy-spanish.conf @@ -187,7 +187,7 @@ mirror_editor_msg="Selecciona un editor de texto para editar las réplicas:" manual_mirrors="Editar lista de réplicas manualmente" -update_mirrors="Descargar y seleccionar réplicas" +update_mirrors_msg="Descargar y seleccionar réplicas" cancel_mirrors="Saltar actualización de réplicas" diff --git a/lang/anarchy-swedish.conf b/lang/anarchy-swedish.conf index d5c27ec7..85859a96 100644 --- a/lang/anarchy-swedish.conf +++ b/lang/anarchy-swedish.conf @@ -79,7 +79,7 @@ mirror_editor_msg="Select a text editor to edit mirrors:" manual_mirrors="Edit Mirrorlist Manually" -update_mirrors="Download & Rank New Mirrors" +update_mirrors_msg="Download & Rank New Mirrors" cancel_mirrors="Skip Updating Mirrors" diff --git a/lib/configure_connection.sh b/lib/configure_connection.sh index e6537f5b..d71fa354 100644 --- a/lib/configure_connection.sh +++ b/lib/configure_connection.sh @@ -54,7 +54,7 @@ update_mirrors() { while (true) do edit_mirrors=$(dialog --ok-button "$ok" --menu "\n$mirror_msg0\n" 12 60 3 \ - "$update_mirrors" "->" \ + "$update_mirrors_msg" "->" \ "$manual_mirrors" "->" \ "$cancel_mirrors" "->" 3>&1 1>&2 2>&3) if [ "$?" -gt "0" ] || [ "$edit_mirrors" == "$cancel_mirrors" ]; then @@ -64,7 +64,7 @@ update_mirrors() { fi case "$edit_mirrors" in - "$update_mirrors") + "$update_mirrors_msg") code=$(dialog --ok-button "$ok" --menu "$mirror_msg1" 17 60 10 \ "$default" "->" \ $countries 3>&1 1>&2 2>&3)