From b6129e6649198e55adbea33d646f5834645504f6 Mon Sep 17 00:00:00 2001
From: lelgenio <lelgenio@disroot.org>
Date: Fri, 17 Apr 2020 23:17:35 -0300
Subject: [PATCH] bump

---
 arch_install | 141 +++++++++++++++++++++++++--------------------------
 1 file changed, 69 insertions(+), 72 deletions(-)

diff --git a/arch_install b/arch_install
index 7b569ec..c5188b1 100755
--- a/arch_install
+++ b/arch_install
@@ -73,6 +73,9 @@ USER_PASSWORD=''
 # System timezone.
 TIMEZONE='America/Sao_Paulo'
 
+# Country code for pacman repos
+COUNTRY='BR'
+
 # Have /tmp on a tmpfs or not.  Leave blank to disable.
 # Only leave this blank on systems with very little RAM.
 TMP_ON_TMPFS='TRUE'
@@ -209,6 +212,9 @@ setup() {
     echo 'Mounting filesystems'
     mount_filesystems "$boot_dev"
 
+    echo 'Setting repos'
+    set_repos
+
     echo 'Installing base system'
     install_base
 
@@ -338,6 +344,69 @@ mount_filesystems() {
     swapon /dev/vg00/swap
 }
 #}}}
+# set_repos() {{{{
+set_repos() {
+    # /etc/pacman.conf{{{
+    cat > /etc/pacman.conf <<EOF
+#
+# GENERAL OPTIONS
+#
+[options]
+HoldPkg     = pacman glibc
+Architecture = auto
+
+# Misc options
+#UseSyslog
+Color
+ILoveCandy
+#TotalDownload
+CheckSpace
+#VerbosePkgLists
+
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+#
+# REPOSITORIES
+#
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist
+
+EOF
+#}}}
+# /etc/pacman.d/mirrorlist{{{
+wget -O- \
+    "https://www.archlinux.org/mirrorlist/?country=$COUNTRY&protocol=http&protocol=https&ip_version=4" |
+    sed 's/^#//;s/^#/##/' |
+    rankmirrors  - | 
+    tee /etc/pacman.d/mirrorlist
+#}}}
+
+mkdir -p /mnt/etc/pacman.d
+cp -r /mnt/etc/pacman* /etc/
+}
+#}}}
 # install_base #{{{
 install_base() {
     pacstrap /mnt $pkgs_base
@@ -373,9 +442,6 @@ configure() {
     local boot_dev="$DRIVE"1
     local lvm_dev="$DRIVE"2
 
-    echo 'Setting repos'
-    set_repos
-
     echo 'Setting hostname'
     set_hostname "$HOSTNAME"
 
@@ -434,75 +500,6 @@ configure() {
     rm "$0"
 }
 #}}}
-# set_repos() {{{{
-set_repos() {
-    # /etc/pacman.conf{{{
-    cat > /etc/pacman.conf <<EOF
-#
-# GENERAL OPTIONS
-#
-[options]
-HoldPkg     = pacman glibc
-Architecture = auto
-
-# Misc options
-#UseSyslog
-Color
-#TotalDownload
-CheckSpace
-#VerbosePkgLists
-
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-#
-# REPOSITORIES
-#
-
-#[testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
-
-
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[multilib]
-Include = /etc/pacman.d/mirrorlist
-
-EOF
-#}}}
-# /etc/mirrorlist{{{
-cat > /etc/mirrorlist <<EOF
-
-# Server list generated by rankmirrors on 2019-11-24
-# Brazil
-Server = http://archlinux.c3sl.ufpr.br/$repo/os/$arch
-Server = https://www.caco.ic.unicamp.br/archlinux/$repo/os/$arch
-Server = http://mirror.ufscar.br/archlinux/$repo/os/$arch
-Server = http://br.mirror.archlinux-br.org/$repo/os/$arch
-Server = http://mirror.ufam.edu.br/archlinux/$repo/os/$arch
-Server = http://www.caco.ic.unicamp.br/archlinux/$repo/os/$arch
-Server = http://linorg.usp.br/archlinux/$repo/os/$arch
-Server = http://archlinux.pop-es.rnp.br/$repo/os/$arch
-Server = http://pet.inf.ufsc.br/mirrors/archlinux/$repo/os/$arch
-
-EOF
-#}}}
-}
-#}}}
 # set_hostname() {#{{{
 set_hostname() {
     local hostname="$1"; shift