kneesox/easy-arch
1
0
Fork 0
mirror of https://github.com/classy-giraffe/easy-arch.git synced 2025-11-17 19:40:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix locales, shorten virt_check, change some prompts, fix incEcho typo

Browse source
This commit is contained in:
i-c-u-p 2022-04-28 09:50:30 +00:00
parent 4ee0ffabdd
commit ea300d5560
No known key found for this signature in database
GPG key ID: ABB80C12170FC0D1
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
easy-arch.sh
View file

@ -52,8 +52,6 @@ virt_check () {
systemctl enable hv_fcopy_daemon --root=/mnt &>/dev/null systemctl enable hv_fcopy_daemon --root=/mnt &>/dev/null
systemctl enable hv_kvp_daemon --root=/mnt &>/dev/null systemctl enable hv_kvp_daemon --root=/mnt &>/dev/null
systemctl enable hv_vss_daemon --root=/mnt &>/dev/null systemctl enable hv_vss_daemon --root=/mnt &>/dev/null
;;
* ) ;;
esac esac
} }
@ -74,7 +72,7 @@ kernel_selector () {
return 0;; return 0;;
4 ) kernel="linux-zen" 4 ) kernel="linux-zen"
return 0;; return 0;;
* ) incecho "You did not enter a valid selection." * ) incEcho "You did not enter a valid selection."
return 1 return 1
esac esac
} }
@ -209,7 +207,6 @@ locale_selector () {
incEcho "The specified locale doesn't exist or isn't supported." incEcho "The specified locale doesn't exist or isn't supported."
return 1 return 1
fi fi
sed -i "$locale/s/^#//" /etc/locale.gen
return 0 return 0
esac esac
} }
@ -241,16 +238,16 @@ print "Welcome to easy-arch, a script made in order to simplify the process of i
# Setting up keyboard layout. # Setting up keyboard layout.
until keyboard_selector; do : ; done until keyboard_selector; do : ; done
PS3="Please select the disk NUMBER e.g. 1 where Arch Linux is going to be installed: " PS3="Please select the disk NUMBER (e.g. 1) where Arch Linux is going to be installed: "
select ENTRY in $(lsblk -dpnoNAME|grep -P "/dev/sd|nvme|vd"); select ENTRY in $(lsblk -dpnoNAME|grep -P "/dev/sd|nvme|vd");
do do
DISK=$ENTRY DISK=$ENTRY
print "Installing Arch Linux on $DISK." print "Arch Linux will be installed to $DISK."
break break
done done
# Warn user about deletion of old partition scheme. # Warn user about deletion of old partition scheme.
echo -en "${BOLD}${UNDERLINE}${BRED}This will delete the current partition table on $DISK once installation starts. Do you agree [y/N]?${RESET} " echo -en "${BOLD}${UNDERLINE}${BRED}This will delete the current partition table on $DISK once installation starts. Do you agree [y/N]?:${RESET} "
read -r disk_response read -r disk_response
disk_response=${disk_response,,} disk_response=${disk_response,,}
if ! [[ "$disk_response" =~ ^(yes|y)$ ]]; then if ! [[ "$disk_response" =~ ^(yes|y)$ ]]; then
@ -334,10 +331,6 @@ mount -o $mountopts,subvol=@var_pkgs $BTRFS /mnt/var/cache/pacman/pkg
chattr +C /mnt/var/log chattr +C /mnt/var/log
mount $ESP /mnt/boot/ mount $ESP /mnt/boot/
# Configure selected keyboard layout and locale
echo "KEYMAP=$kblayout" > /mnt/etc/vconsole.conf
echo "LANG=$locale" > /mnt/etc/locale.conf
# Pacstrap (setting up a base sytem onto the new root). # Pacstrap (setting up a base sytem onto the new root).
print "Installing the base system (it may take a while)." print "Installing the base system (it may take a while)."
pacstrap /mnt --needed base $kernel $microcode linux-firmware $kernel-headers btrfs-progs grub grub-btrfs rsync efibootmgr snapper reflector base-devel snap-pac zram-generator >/dev/null pacstrap /mnt --needed base $kernel $microcode linux-firmware $kernel-headers btrfs-progs grub grub-btrfs rsync efibootmgr snapper reflector base-devel snap-pac zram-generator >/dev/null
@ -349,6 +342,11 @@ echo "$hostname" > /mnt/etc/hostname
print "Generating a new fstab." print "Generating a new fstab."
genfstab -U /mnt >> /mnt/etc/fstab genfstab -U /mnt >> /mnt/etc/fstab
# Configure selected locale and console keymap
sed -i "s/^#$locale/$locale/" /mnt/etc/locale.gen
echo "LANG=$locale" > /mnt/etc/locale.conf
echo "KEYMAP=$kblayout" > /mnt/etc/vconsole.conf
# Setting hosts file. # Setting hosts file.
print "Setting hosts file." print "Setting hosts file."
cat > /mnt/etc/hosts <<EOF cat > /mnt/etc/hosts <<EOF