Skip to content
This repository has been archived by the owner on Apr 9, 2022. It is now read-only.

Remove Fetchmirrors #895

Merged
merged 5 commits into from
Oct 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion etc/anarchy.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion etc/issue_cli
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
1 change: 0 additions & 1 deletion extra/.help
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion extra/.helprc
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ alias 1="anarchy"
alias 2="anarchy -u"
alias 3="iptest"
alias 4="sysinfo"
alias 5="fetchmirrors"
cat /etc/issue_cli
4 changes: 1 addition & 3 deletions iso-generator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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/*
Expand Down
2 changes: 1 addition & 1 deletion lang/anarchy-bulgarian.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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_msg="Download & Rank New Mirrors"

cancel_mirrors="Skip Updating Mirrors"

Expand Down
2 changes: 1 addition & 1 deletion lang/anarchy-dutch.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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_msg="Download & Rank Nieuwe Mirrors"

cancel_mirrors="Sla Mirror Update Over"

Expand Down
2 changes: 1 addition & 1 deletion lang/anarchy-english.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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_msg="Download & Rank New Mirrors"

cancel_mirrors="Skip Updating Mirrors"

Expand Down
2 changes: 1 addition & 1 deletion lang/anarchy-french.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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_msg="Télécharger et trier les nouveaux miroirs"

cancel_mirrors="Sauter la mise à jour des miroirs"

Expand Down
2 changes: 1 addition & 1 deletion lang/anarchy-german.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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_msg="Spiegelserverlisten neu bewerten und aktualisieren"

cancel_mirrors="Aktualisierung der Spiegelserver überspringen"

Expand Down
2 changes: 1 addition & 1 deletion lang/anarchy-greek.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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_msg="Download & Rank New Mirrors"

cancel_mirrors="Skip Updating Mirrors"

Expand Down
2 changes: 1 addition & 1 deletion lang/anarchy-hungarian.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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_msg="Download & Rank New Mirrors"

cancel_mirrors="Skip Updating Mirrors"

Expand Down
2 changes: 1 addition & 1 deletion lang/anarchy-indonesia.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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_msg="Download & Rank New Mirrors"

cancel_mirrors="Skip Updating Mirrors"

Expand Down
2 changes: 1 addition & 1 deletion lang/anarchy-italian.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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_msg="Download & Rank New Mirrors"

cancel_mirrors="Skip Updating Mirrors"

Expand Down
2 changes: 1 addition & 1 deletion lang/anarchy-latvian.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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_msg="Download & Rank New Mirrors"

cancel_mirrors="Skip Updating Mirrors"

Expand Down
2 changes: 1 addition & 1 deletion lang/anarchy-lithuanian.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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_msg="Download & Rank New Mirrors"

cancel_mirrors="Skip Updating Mirrors"

Expand Down
2 changes: 1 addition & 1 deletion lang/anarchy-polish.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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_msg="Pobierz i Sortuj nowe serwery lustrzane"

cancel_mirrors="Pomiń aktualizację serwerów lustrzanych"

Expand Down
2 changes: 1 addition & 1 deletion lang/anarchy-portuguese-br.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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_msg="Baixar & Ordernar novos espelhos"

cancel_mirrors="Pular atualização do espelho"

Expand Down
2 changes: 1 addition & 1 deletion lang/anarchy-portuguese.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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_msg="Download & Rank New Mirrors"

cancel_mirrors="Skip Updating Mirrors"

Expand Down
2 changes: 1 addition & 1 deletion lang/anarchy-romanian.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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_msg="Download & Rank New Mirrors"

cancel_mirrors="Omiteți actualizarea listei mirror"

Expand Down
2 changes: 1 addition & 1 deletion lang/anarchy-russian.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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_msg="Download & Rank New Mirrors"

cancel_mirrors="Skip Updating Mirrors"

Expand Down
2 changes: 1 addition & 1 deletion lang/anarchy-spanish.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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_msg="Descargar y seleccionar réplicas"

cancel_mirrors="Saltar actualización de réplicas"

Expand Down
2 changes: 1 addition & 1 deletion lang/anarchy-swedish.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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_msg="Download & Rank New Mirrors"

cancel_mirrors="Skip Updating Mirrors"

Expand Down
4 changes: 2 additions & 2 deletions lib/configure_connection.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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_msg" "->" \
"$manual_mirrors" "->" \
"$cancel_mirrors" "->" 3>&1 1>&2 2>&3)
if [ "$?" -gt "0" ] || [ "$edit_mirrors" == "$cancel_mirrors" ]; then
Expand All @@ -64,7 +64,7 @@ update_mirrors() {
fi

case "$edit_mirrors" in
"$fetchmirrors")
"$update_mirrors_msg")
code=$(dialog --ok-button "$ok" --menu "$mirror_msg1" 17 60 10 \
"$default" "->" \
$countries 3>&1 1>&2 2>&3)
Expand Down