diff --git a/Amelia.sh b/Amelia.sh index fc289c7..279d3be 100644 --- a/Amelia.sh +++ b/Amelia.sh @@ -2,7 +2,7 @@ # Amelia Installer # https://gitlab.com/prism7/archery -# Version: 8.2.2 +# Version: 8.3.0 set -euo pipefail ################################################################################################### @@ -730,7 +730,7 @@ Enter your keyboard layout ${bwhite}(empty for 'us')${blue}: " ### ${SETKBD} Keyboard Layout has been selected " - loadkeys "${SETKBD}" > /dev/null 2> error_log.txt || stage_fail + loadkeys "${SETKBD}" > /dev/null 2> amelia_log.txt || stage_fail fi ok } @@ -1835,7 +1835,9 @@ ${magenta}###${nc}--------------------------------------${magenta}[ ${bwhite}Des [11] Basic Arch Linux (No GUI) - [12] Custom Arch Linux ${red}### ${yellow}EXPERTS ONLY ${red}### " + [12] Custom Arch Linux ${red}### ${yellow}EXPERTS ONLY ${red}###${nc} + + [13] Cosmic ${red}(Alpha) " BLUE " @@ -1941,6 +1943,8 @@ Enter [Y/n]: " desktopname="Custom Arch Linux" until cust_sys; do :; done return 0 ;; + 13) + desktopname="Cosmic" ;; "") choice return 1 ;; @@ -2709,10 +2713,10 @@ Enter a Custom Percentage number ${nc}e.g. 30 ${bwhite}(empty to skip)${blue}: " case "${preset}" in 1) - sgdisk -o "${sgdrive}" > /dev/null 2> error_log.txt || stage_fail - sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > /dev/null 2> error_log.txt || stage_fail - sgdisk -I -n2:0:0 -t2:8304 -c2:ROOT "${sgdrive}" > /dev/null 2> error_log.txt || stage_fail - partprobe -s "${sgdrive}" > /dev/null 2> error_log.txt || stage_fail + sgdisk -o "${sgdrive}" > /dev/null 2> amelia_log.txt || stage_fail + sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > /dev/null 2> amelia_log.txt || stage_fail + sgdisk -I -n2:0:0 -t2:8304 -c2:ROOT "${sgdrive}" > /dev/null 2> amelia_log.txt || stage_fail + partprobe -s "${sgdrive}" > /dev/null 2> amelia_log.txt || stage_fail if [[ "${install}" == "yes" ]]; then until sanity_check; do : ; done else @@ -2720,22 +2724,22 @@ Enter a Custom Percentage number ${nc}e.g. 30 ${bwhite}(empty to skip)${blue}: " fi ;; 2) until set_swapsize; do : ; done - sgdisk -o "${sgdrive}" > /dev/null 2> error_log.txt || stage_fail - sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > /dev/null 2> error_log.txt || stage_fail - sgdisk -I -n2:0:+"${swapsize}"G -t2:8200 -c2:SWAP "${sgdrive}" > /dev/null 2> error_log.txt || stage_fail - sgdisk -I -n3:0:0 -t3:8304 -c3:ROOT "${sgdrive}" > /dev/null 2> error_log.txt || stage_fail - partprobe -s "${sgdrive}" > /dev/null 2> error_log.txt || stage_fail + sgdisk -o "${sgdrive}" > /dev/null 2> amelia_log.txt || stage_fail + sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > /dev/null 2> amelia_log.txt || stage_fail + sgdisk -I -n2:0:+"${swapsize}"G -t2:8200 -c2:SWAP "${sgdrive}" > /dev/null 2> amelia_log.txt || stage_fail + sgdisk -I -n3:0:0 -t3:8304 -c3:ROOT "${sgdrive}" > /dev/null 2> amelia_log.txt || stage_fail + partprobe -s "${sgdrive}" > /dev/null 2> amelia_log.txt || stage_fail if [[ "${install}" == "yes" ]]; then until sanity_check; do : ; done else ok fi ;; 3) - sgdisk -o "${sgdrive}" > /dev/null 2> error_log.txt || stage_fail - sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > /dev/null 2> error_log.txt || stage_fail - sgdisk -I -n2:0:+"${rootsize}"G -t2:8304 -c2:ROOT "${sgdrive}" > /dev/null 2> error_log.txt || stage_fail - sgdisk -I -n3:0:0 -t3:8302 -c3:HOME "${sgdrive}" > /dev/null 2> error_log.txt || stage_fail - partprobe -s "${sgdrive}" > /dev/null 2> error_log.txt || stage_fail + sgdisk -o "${sgdrive}" > /dev/null 2> amelia_log.txt || stage_fail + sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > /dev/null 2> amelia_log.txt || stage_fail + sgdisk -I -n2:0:+"${rootsize}"G -t2:8304 -c2:ROOT "${sgdrive}" > /dev/null 2> amelia_log.txt || stage_fail + sgdisk -I -n3:0:0 -t3:8302 -c3:HOME "${sgdrive}" > /dev/null 2> amelia_log.txt || stage_fail + partprobe -s "${sgdrive}" > /dev/null 2> amelia_log.txt || stage_fail if [[ "${install}" == "yes" ]]; then until sanity_check; do : ; done else @@ -2743,12 +2747,12 @@ Enter a Custom Percentage number ${nc}e.g. 30 ${bwhite}(empty to skip)${blue}: " fi ;; 4) until set_swapsize; do : ; done - sgdisk -o "${sgdrive}" > /dev/null 2> error_log.txt || stage_fail - sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > /dev/null 2> error_log.txt || stage_fail - sgdisk -I -n2:0:+"${swapsize}"G -t2:8200 -c2:SWAP "${sgdrive}" > /dev/null 2> error_log.txt || stage_fail - sgdisk -I -n3:0:+"${rootsize}"G -t3:8304 -c3:ROOT "${sgdrive}" > /dev/null 2> error_log.txt || stage_fail - sgdisk -I -n4:0:0 -t4:8302 -c4:HOME "${sgdrive}" > /dev/null 2> error_log.txt || stage_fail - partprobe -s "${sgdrive}" > /dev/null 2> error_log.txt || stage_fail + sgdisk -o "${sgdrive}" > /dev/null 2> amelia_log.txt || stage_fail + sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > /dev/null 2> amelia_log.txt || stage_fail + sgdisk -I -n2:0:+"${swapsize}"G -t2:8200 -c2:SWAP "${sgdrive}" > /dev/null 2> amelia_log.txt || stage_fail + sgdisk -I -n3:0:+"${rootsize}"G -t3:8304 -c3:ROOT "${sgdrive}" > /dev/null 2> amelia_log.txt || stage_fail + sgdisk -I -n4:0:0 -t4:8302 -c4:HOME "${sgdrive}" > /dev/null 2> amelia_log.txt || stage_fail + partprobe -s "${sgdrive}" > /dev/null 2> amelia_log.txt || stage_fail if [[ "${install}" == "yes" ]]; then until sanity_check; do : ; done else @@ -3932,7 +3936,7 @@ swappart() { ${magenta}###${nc}----------------------------------${magenta}[ ${bwhite}Swap Partition Setup${nc} ${magenta}]${nc}----------------------------------${magenta}### " - if mkswap "${swap_dev}" > /dev/null 2> error_log.txt ; then + if mkswap "${swap_dev}" > /dev/null 2> amelia_log.txt ; then stage_ok else stage_fail @@ -4035,9 +4039,9 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A espfs="$(lsblk -dno FSTYPE "${esp_dev}")" if [[ "${fs}" == "1" ]]; then - if mkfs.ext4 -F -L Root "${root_dev}" > /dev/null 2> error_log.txt ; then - tune2fs -O fast_commit "${root_dev}" > /dev/null 2> error_log.txt || err_abort - mount "${root_dev}" /mnt > /dev/null 2> error_log.txt || err_abort + if mkfs.ext4 -F -L Root "${root_dev}" > /dev/null 2> amelia_log.txt ; then + tune2fs -O fast_commit "${root_dev}" > /dev/null 2> amelia_log.txt || err_abort + mount "${root_dev}" /mnt > /dev/null 2> amelia_log.txt || err_abort sleep 0.2 NC " ==> [${green}/Root OK${nc}] @@ -4049,27 +4053,27 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A fi #-------------------------------------------------------------------------------------------------- elif [[ "${fs}" == "2" ]]; then - if mkfs.btrfs -f -L Root "${root_dev}" > /dev/null 2> error_log.txt ; then - mount "${root_dev}" /mnt > /dev/null 2> error_log.txt || err_abort - btrfs subvolume create /mnt/@ > /dev/null 2> error_log.txt || err_abort - btrfs subvolume create /mnt/@home > /dev/null 2> error_log.txt || err_abort - btrfs subvolume create /mnt/@cache > /dev/null 2> error_log.txt || err_abort - btrfs subvolume create /mnt/@log > /dev/null 2> error_log.txt || err_abort - btrfs subvolume create /mnt/@tmp > /dev/null 2> error_log.txt || err_abort - btrfs subvolume create /mnt/@snapshots > /dev/null 2> error_log.txt || err_abort + if mkfs.btrfs -f -L Root "${root_dev}" > /dev/null 2> amelia_log.txt ; then + mount "${root_dev}" /mnt > /dev/null 2> amelia_log.txt || err_abort + btrfs subvolume create /mnt/@ > /dev/null 2> amelia_log.txt || err_abort + btrfs subvolume create /mnt/@home > /dev/null 2> amelia_log.txt || err_abort + btrfs subvolume create /mnt/@cache > /dev/null 2> amelia_log.txt || err_abort + btrfs subvolume create /mnt/@log > /dev/null 2> amelia_log.txt || err_abort + btrfs subvolume create /mnt/@tmp > /dev/null 2> amelia_log.txt || err_abort + btrfs subvolume create /mnt/@snapshots > /dev/null 2> amelia_log.txt || err_abort if [[ "${swapmode}" == "2" ]]; then - btrfs subvolume create /mnt/@swap > /dev/null 2> error_log.txt || err_abort + btrfs subvolume create /mnt/@swap > /dev/null 2> amelia_log.txt || err_abort fi - umount /mnt > /dev/null 2> error_log.txt || err_abort - mount -o "${sbvl_mnt_opts}",subvol=@ "${root_dev}" /mnt > /dev/null 2> error_log.txt || err_abort + umount /mnt > /dev/null 2> amelia_log.txt || err_abort + mount -o "${sbvl_mnt_opts}",subvol=@ "${root_dev}" /mnt > /dev/null 2> amelia_log.txt || err_abort if [[ "${swapmode}" == "2" ]]; then - mount --mkdir -o rw,nodatacow,subvol=@swap "${root_dev}" /mnt/swap > /dev/null 2> error_log.txt || err_abort + mount --mkdir -o rw,nodatacow,subvol=@swap "${root_dev}" /mnt/swap > /dev/null 2> amelia_log.txt || err_abort fi - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache "${root_dev}" /mnt/var/cache > /dev/null 2> error_log.txt || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home "${root_dev}" /mnt/home > /dev/null 2> error_log.txt || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log "${root_dev}" /mnt/var/log > /dev/null 2> error_log.txt || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@snapshots "${root_dev}" /mnt/"${snapname}" > /dev/null 2> error_log.txt || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@tmp "${root_dev}" /mnt/var/tmp > /dev/null 2> error_log.txt || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache "${root_dev}" /mnt/var/cache > /dev/null 2> amelia_log.txt || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home "${root_dev}" /mnt/home > /dev/null 2> amelia_log.txt || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log "${root_dev}" /mnt/var/log > /dev/null 2> amelia_log.txt || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@snapshots "${root_dev}" /mnt/"${snapname}" > /dev/null 2> amelia_log.txt || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@tmp "${root_dev}" /mnt/var/tmp > /dev/null 2> amelia_log.txt || err_abort sleep 0.2 NC " ==> [${green}/@ OK${nc}] @@ -4083,8 +4087,8 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A sleep 0.2 #-------------------------------------------------------------------------------------------------- if [[ "${multibooting}" == "n" ]]; then - if mkfs.fat -F 32 -n ESP "${esp_dev}" > /dev/null 2> error_log.txt ; then - mount --mkdir "${esp_dev}" "${esp_mount}" > /dev/null 2> error_log.txt || err_abort + if mkfs.fat -F 32 -n ESP "${esp_dev}" > /dev/null 2> amelia_log.txt ; then + mount --mkdir "${esp_dev}" "${esp_mount}" > /dev/null 2> amelia_log.txt || err_abort sleep 0.2 NC " ==> [${green}/ESP OK${nc}] @@ -4096,7 +4100,7 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A until mount_esp; do : ; done fi elif [[ "${multibooting}" == "y" && "${espfs}" == "vfat" ]]; then - if mount --mkdir "${esp_dev}" "${esp_mount}" > /dev/null 2> error_log.txt ; then + if mount --mkdir "${esp_dev}" "${esp_mount}" > /dev/null 2> amelia_log.txt ; then sleep 0.2 NC " ==> [${green}Unformatted /ESP OK${nc}] @@ -4107,8 +4111,8 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A until mount_esp; do : ; done fi elif [[ "${multibooting}" == "y" && "${espfs}" != "vfat" ]]; then - if mkfs.fat -F 32 -n ESP "${esp_dev}" > /dev/null 2> error_log.txt ; then - mount --mkdir "${esp_dev}" "${esp_mount}" > /dev/null 2> error_log.txt || err_abort + if mkfs.fat -F 32 -n ESP "${esp_dev}" > /dev/null 2> amelia_log.txt ; then + mount --mkdir "${esp_dev}" "${esp_mount}" > /dev/null 2> amelia_log.txt || err_abort sleep 0.2 NC " ==> [${green}/ESP OK${nc}] @@ -4123,8 +4127,8 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A sleep 0.2 #-------------------------------------------------------------------------------------------------- if [[ ${xbootloader} == "yes" ]]; then - if mkfs.fat -F 32 -n XBOOTLDR "${xboot_dev}" > /dev/null 2> error_log.txt ; then - mount --mkdir "${xboot_dev}" /mnt/boot > /dev/null 2> error_log.txt || err_abort + if mkfs.fat -F 32 -n XBOOTLDR "${xboot_dev}" > /dev/null 2> amelia_log.txt ; then + mount --mkdir "${xboot_dev}" /mnt/boot > /dev/null 2> amelia_log.txt || err_abort sleep 0.2 NC " ==> [${green}/XBOOTLDR OK${nc}] @@ -4160,9 +4164,9 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A fi if [[ "${homeform}" == "y" ]]; then - if mkfs.ext4 -F -L Home "${home_dev}" > /dev/null 2> error_log.txt ; then - tune2fs -O fast_commit "${home_dev}" > /dev/null 2> error_log.txt || err_abort - mount --mkdir "${home_dev}" /mnt/home > /dev/null 2> error_log.txt || err_abort + if mkfs.ext4 -F -L Home "${home_dev}" > /dev/null 2> amelia_log.txt ; then + tune2fs -O fast_commit "${home_dev}" > /dev/null 2> amelia_log.txt || err_abort + mount --mkdir "${home_dev}" /mnt/home > /dev/null 2> amelia_log.txt || err_abort sleep 0.2 NC " ==> [${green}/Home OK${nc}] @@ -4237,7 +4241,7 @@ Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: " manespfs="$(lsblk -dno FSTYPE "${esppart}")" if [[ -e "${esppart}" ]]; then if [[ "${multibooting}" == "n" ]]; then - if mkfs.fat -F 32 -n ESP "${esppart}" > /dev/null 2> error_log.txt ; then + if mkfs.fat -F 32 -n ESP "${esppart}" > /dev/null 2> amelia_log.txt ; then sleep 0.2 NC " @@ -4256,7 +4260,7 @@ Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: " ==> [${green}/Unformatted ESP OK${nc}] " return 0 elif [[ "${multibooting}" == "y" && "${manespfs}" != "vfat" ]]; then - if mkfs.fat -F 32 -n ESP "${esppart}" > /dev/null 2> error_log.txt ; then + if mkfs.fat -F 32 -n ESP "${esppart}" > /dev/null 2> amelia_log.txt ; then sleep 0.2 NC " @@ -4310,7 +4314,7 @@ Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: " if [[ -n "${form_xboot_nmbr}" ]]; then xbootpart="$(echo "${volumes}" | awk "\$1 == ${form_xboot_nmbr} {print \$2}")" if [[ -e "${xbootpart}" ]]; then - if mkfs.fat -F 32 -n XBOOTLDR "${xbootpart}" > /dev/null 2> error_log.txt ; then + if mkfs.fat -F 32 -n XBOOTLDR "${xbootpart}" > /dev/null 2> amelia_log.txt ; then sleep 0.2 NC " @@ -4365,8 +4369,8 @@ Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: " if [[ -e "${rootpart}" ]]; then #-------------------------------------------------------------------------------------------------- if [[ "${fs}" == "1" ]]; then - if mkfs.ext4 -F "${rootpart}" > /dev/null 2> error_log.txt ; then - tune2fs -O fast_commit "${rootpart}" > /dev/null 2> error_log.txt || err_abort + if mkfs.ext4 -F "${rootpart}" > /dev/null 2> amelia_log.txt ; then + tune2fs -O fast_commit "${rootpart}" > /dev/null 2> amelia_log.txt || err_abort sleep 0.2 NC " @@ -4380,18 +4384,18 @@ Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: " fi #-------------------------------------------------------------------------------------------------- elif [[ "${fs}" == "2" ]]; then - if mkfs.btrfs -f "${rootpart}" > /dev/null 2> error_log.txt ; then - mount "${rootpart}" /mnt > /dev/null 2> error_log.txt || err_abort - btrfs subvolume create /mnt/@ > /dev/null 2> error_log.txt || err_abort - btrfs subvolume create /mnt/@home > /dev/null 2> error_log.txt || err_abort - btrfs subvolume create /mnt/@cache > /dev/null 2> error_log.txt || err_abort - btrfs subvolume create /mnt/@log > /dev/null 2> error_log.txt || err_abort - btrfs subvolume create /mnt/@tmp > /dev/null 2> error_log.txt || err_abort - btrfs subvolume create /mnt/@snapshots > /dev/null 2> error_log.txt || err_abort + if mkfs.btrfs -f "${rootpart}" > /dev/null 2> amelia_log.txt ; then + mount "${rootpart}" /mnt > /dev/null 2> amelia_log.txt || err_abort + btrfs subvolume create /mnt/@ > /dev/null 2> amelia_log.txt || err_abort + btrfs subvolume create /mnt/@home > /dev/null 2> amelia_log.txt || err_abort + btrfs subvolume create /mnt/@cache > /dev/null 2> amelia_log.txt || err_abort + btrfs subvolume create /mnt/@log > /dev/null 2> amelia_log.txt || err_abort + btrfs subvolume create /mnt/@tmp > /dev/null 2> amelia_log.txt || err_abort + btrfs subvolume create /mnt/@snapshots > /dev/null 2> amelia_log.txt || err_abort if [[ "${swapmode}" == "2" ]]; then - btrfs subvolume create /mnt/@swap > /dev/null 2> error_log.txt || err_abort + btrfs subvolume create /mnt/@swap > /dev/null 2> amelia_log.txt || err_abort fi - umount /mnt > /dev/null 2> error_log.txt || err_abort + umount /mnt > /dev/null 2> amelia_log.txt || err_abort sleep 0.2 NC " @@ -4421,7 +4425,7 @@ Enter a name ${bwhite}(empty to skip and proceed)${blue}: " if [[ -n "${rootpartname}" ]]; then if [[ "${fs}" == "1" ]]; then - if e2label "${rootpart}" "${rootpartname}" > /dev/null 2> error_log.txt ; then + if e2label "${rootpart}" "${rootpartname}" > /dev/null 2> amelia_log.txt ; then sleep 0.2 NC " @@ -4433,7 +4437,7 @@ Enter a name ${bwhite}(empty to skip and proceed)${blue}: " fi elif [[ "${fs}" == "2" ]]; then mount "${rootpart}" /mnt || err_abort - btrfs filesystem label /mnt "${rootpartname}" > /dev/null 2> error_log.txt || err_abort + btrfs filesystem label /mnt "${rootpartname}" > /dev/null 2> amelia_log.txt || err_abort umount /mnt || err_abort sleep 0.2 NC " @@ -4479,9 +4483,9 @@ ask_homepart_form() { fi if [[ "${homeform}" == "y" ]]; then - if mkfs.ext4 -F -L Home "${home_dev}" > /dev/null 2> error_log.txt ; then - tune2fs -O fast_commit "${home_dev}" > /dev/null 2> error_log.txt || err_abort - mount --mkdir "${home_dev}" /mnt/home > /dev/null 2> error_log.txt || err_abort + if mkfs.ext4 -F -L Home "${home_dev}" > /dev/null 2> amelia_log.txt ; then + tune2fs -O fast_commit "${home_dev}" > /dev/null 2> amelia_log.txt || err_abort + mount --mkdir "${home_dev}" /mnt/home > /dev/null 2> amelia_log.txt || err_abort sleep 0.2 NC " ==> [${green}/Home OK${nc}] @@ -4534,8 +4538,8 @@ Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: " if [[ -n "${form_home_nmbr}" ]]; then homepart="$(echo "${volumes}" | awk "\$1 == ${form_home_nmbr} {print \$2}")" if [[ -e "${homepart}" ]]; then - if mkfs.ext4 -F "${homepart}" > /dev/null 2> error_log.txt ; then - tune2fs -O fast_commit "${homepart}" > /dev/null 2> error_log.txt || err_abort + if mkfs.ext4 -F "${homepart}" > /dev/null 2> amelia_log.txt ; then + tune2fs -O fast_commit "${homepart}" > /dev/null 2> amelia_log.txt || err_abort sleep 0.2 NC " @@ -4562,7 +4566,7 @@ Enter a name ${bwhite}(empty to skip and proceed)${blue}: " ==> " homepartname if [[ -n "${homepartname}" ]]; then - if e2label "${homepart}" "${homepartname}" > /dev/null 2> error_log.txt ;then + if e2label "${homepart}" "${homepartname}" > /dev/null 2> amelia_log.txt ;then sleep 0.2 NC " @@ -4615,7 +4619,7 @@ Enter your${nc} ${cyan}${roottype} ${blue}partition number: " if [[ -e "${rootpart}" ]]; then #-------------------------------------------------------------------------------------------------- if [[ "${fs}" == "1" ]]; then - if mount "${rootpart}" /mnt > /dev/null 2> error_log.txt ; then + if mount "${rootpart}" /mnt > /dev/null 2> amelia_log.txt ; then sleep 0.2 ok return 0 @@ -4625,15 +4629,15 @@ Enter your${nc} ${cyan}${roottype} ${blue}partition number: " fi #-------------------------------------------------------------------------------------------------- elif [[ "${fs}" == "2" ]]; then - if mount -o "${sbvl_mnt_opts}",subvol=@ "${rootpart}" /mnt > /dev/null 2> error_log.txt ; then + if mount -o "${sbvl_mnt_opts}",subvol=@ "${rootpart}" /mnt > /dev/null 2> amelia_log.txt ; then if [[ "${swapmode}" == "2" ]]; then - mount --mkdir -o rw,nodatacow,subvol=@swap "${rootpart}" /mnt/swap > /dev/null 2> error_log.txt || err_abort + mount --mkdir -o rw,nodatacow,subvol=@swap "${rootpart}" /mnt/swap > /dev/null 2> amelia_log.txt || err_abort fi - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache "${rootpart}" /mnt/var/cache > /dev/null 2> error_log.txt || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home "${rootpart}" /mnt/home > /dev/null 2> error_log.txt || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log "${rootpart}" /mnt/var/log > /dev/null 2> error_log.txt || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@snapshots "${rootpart}" /mnt/"${snapname}" > /dev/null 2> error_log.txt || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@tmp "${rootpart}" /mnt/var/tmp > /dev/null 2> error_log.txt || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache "${rootpart}" /mnt/var/cache > /dev/null 2> amelia_log.txt || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home "${rootpart}" /mnt/home > /dev/null 2> amelia_log.txt || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log "${rootpart}" /mnt/var/log > /dev/null 2> amelia_log.txt || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@snapshots "${rootpart}" /mnt/"${snapname}" > /dev/null 2> amelia_log.txt || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@tmp "${rootpart}" /mnt/var/tmp > /dev/null 2> amelia_log.txt || err_abort sleep 0.2 ok return 0 @@ -4680,7 +4684,7 @@ Enter your${nc} ${cyan}/ESP ${blue}partition number: " if [[ -n "${mntesp_nmbr}" ]]; then esppart="$(echo "${volumes}" | awk "\$1 == ${mntesp_nmbr} {print \$2}")" if [[ -e "${esppart}" ]]; then - if mount --mkdir "${esppart}" "${esp_mount}" > /dev/null 2> error_log.txt ; then + if mount --mkdir "${esppart}" "${esp_mount}" > /dev/null 2> amelia_log.txt ; then ok return 0 else @@ -4725,7 +4729,7 @@ Enter your${nc} ${cyan}/XBOOTLDR ${blue}partition number: " if [[ -n "${mntxboot_nmbr}" ]]; then xbootpart="$(echo "${volumes}" | awk "\$1 == ${mntxboot_nmbr} {print \$2}")" if [[ -e "${xbootpart}" ]]; then - if mount --mkdir "${xbootpart}" /mnt/boot > /dev/null 2> error_log.txt ; then + if mount --mkdir "${xbootpart}" /mnt/boot > /dev/null 2> amelia_log.txt ; then ok return 0 else @@ -4771,7 +4775,7 @@ Enter your${nc} ${cyan}/Home ${blue}partition number: " if [[ -n "${mnthome_nmbr}" ]]; then homepart="$(echo "${volumes}" | awk "\$1 == ${mnthome_nmbr} {print \$2}")" if [[ -e "${homepart}" ]]; then - if mount --mkdir "${homepart}" /mnt/home > /dev/null 2> error_log.txt ; then + if mount --mkdir "${homepart}" /mnt/home > /dev/null 2> amelia_log.txt ; then ok return 0 else @@ -4839,6 +4843,7 @@ revise() { revision="yes" reset=(xbootloader="" vgaconf="" vendor_slct="" packages="" custompkgs="" customservices="" cust_bootopts="" REGDOM="" preset="" autoroot="" autoxboot="" autohome="" autoswap="") export "${reset[@]}" + until slct_krnl; do : ; done until ask_bootldr; do : ; done until slct_espmnt; do : ; done @@ -4956,36 +4961,36 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS fi #------------------------------------------------------------------------------------------ if [[ "${fs}" == "1" ]]; then - mkfs.ext4 -F -L Root /dev/mapper/"${ENCROOT}" > /dev/null 2> error_log.txt || err_abort - tune2fs -O fast_commit /dev/mapper/"${ENCROOT}" > /dev/null 2> error_log.txt || err_abort - mount /dev/mapper/"${ENCROOT}" /mnt > /dev/null 2> error_log.txt || err_abort + mkfs.ext4 -F -L Root /dev/mapper/"${ENCROOT}" > /dev/null 2> amelia_log.txt || err_abort + tune2fs -O fast_commit /dev/mapper/"${ENCROOT}" > /dev/null 2> amelia_log.txt || err_abort + mount /dev/mapper/"${ENCROOT}" /mnt > /dev/null 2> amelia_log.txt || err_abort sleep 0.2 NC " ==> [${green}Encrypted /Root OK${nc}] " #------------------------------------------------------------------------------------------ elif [[ "${fs}" == "2" ]]; then - mkfs.btrfs -f -L Root /dev/mapper/"${ENCROOT}" > /dev/null 2> error_log.txt || err_abort - mount /dev/mapper/"${ENCROOT}" /mnt > /dev/null 2> error_log.txt || err_abort - btrfs subvolume create /mnt/@ > /dev/null 2> error_log.txt || err_abort - btrfs subvolume create /mnt/@home > /dev/null 2> error_log.txt || err_abort - btrfs subvolume create /mnt/@cache > /dev/null 2> error_log.txt || err_abort - btrfs subvolume create /mnt/@log > /dev/null 2> error_log.txt || err_abort - btrfs subvolume create /mnt/@snapshots > /dev/null 2> error_log.txt || err_abort - btrfs subvolume create /mnt/@tmp > /dev/null 2> error_log.txt || err_abort + mkfs.btrfs -f -L Root /dev/mapper/"${ENCROOT}" > /dev/null 2> amelia_log.txt || err_abort + mount /dev/mapper/"${ENCROOT}" /mnt > /dev/null 2> amelia_log.txt || err_abort + btrfs subvolume create /mnt/@ > /dev/null 2> amelia_log.txt || err_abort + btrfs subvolume create /mnt/@home > /dev/null 2> amelia_log.txt || err_abort + btrfs subvolume create /mnt/@cache > /dev/null 2> amelia_log.txt || err_abort + btrfs subvolume create /mnt/@log > /dev/null 2> amelia_log.txt || err_abort + btrfs subvolume create /mnt/@snapshots > /dev/null 2> amelia_log.txt || err_abort + btrfs subvolume create /mnt/@tmp > /dev/null 2> amelia_log.txt || err_abort if [[ "${swapmode}" == "2" ]]; then - btrfs subvolume create /mnt/@swap > /dev/null 2> error_log.txt || err_abort + btrfs subvolume create /mnt/@swap > /dev/null 2> amelia_log.txt || err_abort fi - umount /mnt > /dev/null 2> error_log.txt || err_abort - mount -o "${sbvl_mnt_opts}",subvol=@ /dev/mapper/"${ENCROOT}" /mnt > /dev/null 2> error_log.txt || err_abort + umount /mnt > /dev/null 2> amelia_log.txt || err_abort + mount -o "${sbvl_mnt_opts}",subvol=@ /dev/mapper/"${ENCROOT}" /mnt > /dev/null 2> amelia_log.txt || err_abort if [[ "${swapmode}" == "2" ]]; then - mount --mkdir -o rw,nodatacow,subvol=@swap /dev/mapper/"${ENCROOT}" /mnt/swap > /dev/null 2> error_log.txt || err_abort + mount --mkdir -o rw,nodatacow,subvol=@swap /dev/mapper/"${ENCROOT}" /mnt/swap > /dev/null 2> amelia_log.txt || err_abort fi - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache /dev/mapper/"${ENCROOT}" /mnt/var/cache > /dev/null 2> error_log.txt || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home /dev/mapper/"${ENCROOT}" /mnt/home > /dev/null 2> error_log.txt || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log /dev/mapper/"${ENCROOT}" /mnt/var/log > /dev/null 2> error_log.txt || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@snapshots /dev/mapper/"${ENCROOT}" /mnt/"${snapname}" > /dev/null 2> error_log.txt || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@tmp /dev/mapper/"${ENCROOT}" /mnt/var/tmp > /dev/null 2> error_log.txt || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache /dev/mapper/"${ENCROOT}" /mnt/var/cache > /dev/null 2> amelia_log.txt || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home /dev/mapper/"${ENCROOT}" /mnt/home > /dev/null 2> amelia_log.txt || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log /dev/mapper/"${ENCROOT}" /mnt/var/log > /dev/null 2> amelia_log.txt || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@snapshots /dev/mapper/"${ENCROOT}" /mnt/"${snapname}" > /dev/null 2> amelia_log.txt || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@tmp /dev/mapper/"${ENCROOT}" /mnt/var/tmp > /dev/null 2> amelia_log.txt || err_abort sleep 0.2 NC " ==> [${green}Encrypted /@ OK${nc}] @@ -5006,7 +5011,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS else cryptsetup luksOpen "${swap_dev}" swap || err_abort fi - mkswap /dev/mapper/swap > /dev/null 2> error_log.txt || err_abort + mkswap /dev/mapper/swap > /dev/null 2> amelia_log.txt || err_abort sleep 0.2 NC " ==> [${green}Encrypted /Swap OK${nc}] @@ -5027,9 +5032,9 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS else cryptsetup luksOpen "${home_dev}" "${ENCRHOME}" || err_abort fi - mkfs.ext4 -F -L Home /dev/mapper/"${ENCRHOME}" > /dev/null 2> error_log.txt || err_abort - tune2fs -O fast_commit /dev/mapper/"${ENCRHOME}" > /dev/null 2> error_log.txt || err_abort - mount --mkdir /dev/mapper/"${ENCRHOME}" /mnt/home > /dev/null 2> error_log.txt || err_abort + mkfs.ext4 -F -L Home /dev/mapper/"${ENCRHOME}" > /dev/null 2> amelia_log.txt || err_abort + tune2fs -O fast_commit /dev/mapper/"${ENCRHOME}" > /dev/null 2> amelia_log.txt || err_abort + mount --mkdir /dev/mapper/"${ENCRHOME}" /mnt/home > /dev/null 2> amelia_log.txt || err_abort sleep 0.2 NC " ==> [${green}Encrypted /Home OK${nc}] @@ -5054,9 +5059,9 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS homeform="${homeform,,}" if [[ "${homeform}" == "y" ]]; then - if mkfs.ext4 -F -L Home "${home_dev}" > /dev/null 2> error_log.txt ; then - tune2fs -O fast_commit "${home_dev}" > /dev/null 2> error_log.txt || err_abort - mount --mkdir "${home_dev}" /mnt/home > /dev/null 2> error_log.txt || err_abort + if mkfs.ext4 -F -L Home "${home_dev}" > /dev/null 2> amelia_log.txt ; then + tune2fs -O fast_commit "${home_dev}" > /dev/null 2> amelia_log.txt || err_abort + mount --mkdir "${home_dev}" /mnt/home > /dev/null 2> amelia_log.txt || err_abort sleep 0.2 NC " ==> [${green}/Home OK${nc}] @@ -5076,8 +5081,8 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS fi #-------------------------------------------------------------------------------------------------- if [[ "${multibooting}" == "n" ]]; then - if mkfs.fat -F 32 -n ESP "${esp_dev}" > /dev/null 2> error_log.txt ; then - mount --mkdir "${esp_dev}" "${esp_mount}" > /dev/null 2> error_log.txt || err_abort + if mkfs.fat -F 32 -n ESP "${esp_dev}" > /dev/null 2> amelia_log.txt ; then + mount --mkdir "${esp_dev}" "${esp_mount}" > /dev/null 2> amelia_log.txt || err_abort sleep 0.2 NC " ==> [${green}/ESP OK${nc}] @@ -5087,7 +5092,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS until luks; do : ; done fi elif [[ "${multibooting}" == "y" && "${espfs}" == "vfat" ]]; then - if mount --mkdir "${esp_dev}" "${esp_mount}" > /dev/null 2> error_log.txt ; then + if mount --mkdir "${esp_dev}" "${esp_mount}" > /dev/null 2> amelia_log.txt ; then sleep 0.2 NC " ==> [${green}Unformatted /ESP OK${nc}] @@ -5099,8 +5104,8 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS return 1 fi elif [[ "${multibooting}" == "y" && "${espfs}" != "vfat" ]]; then - if mkfs.fat -F 32 -n ESP "${esp_dev}" > /dev/null 2> error_log.txt ; then - mount --mkdir "${esp_dev}" "${esp_mount}" > /dev/null 2> error_log.txt || err_abort + if mkfs.fat -F 32 -n ESP "${esp_dev}" > /dev/null 2> amelia_log.txt ; then + mount --mkdir "${esp_dev}" "${esp_mount}" > /dev/null 2> amelia_log.txt || err_abort sleep 0.2 NC " ==> [${green}/ESP OK${nc}] @@ -5112,8 +5117,8 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS fi #-------------------------------------------------------------------------------------------------- if [[ "${xbootloader}" == "yes" ]] ; then - if mkfs.fat -F 32 -n XBOOTLDR "${xboot_dev}" > /dev/null 2> error_log.txt ; then - mount --mkdir "${xboot_dev}" /mnt/boot > /dev/null 2> error_log.txt || err_abort + if mkfs.fat -F 32 -n XBOOTLDR "${xboot_dev}" > /dev/null 2> amelia_log.txt ; then + mount --mkdir "${xboot_dev}" /mnt/boot > /dev/null 2> amelia_log.txt || err_abort sleep 0.2 NC " ==> [${green}/XBOOTLDR OK${nc}] @@ -5233,7 +5238,7 @@ Enter a number: " parallelnmbr="${parallelnmbr,,}" if [[ "${parallelnmbr}" =~ ^(2|3|4|5)$ ]]; then - sed -i "s|#ParallelDownloads = 5|ParallelDownloads = ${parallelnmbr}|g" /etc/pacman.conf > /dev/null 2> error_log.txt || err_abort + sed -i "s|#ParallelDownloads = 5|ParallelDownloads = ${parallelnmbr}|g" /etc/pacman.conf > /dev/null 2> amelia_log.txt || err_abort else invalid return 1 @@ -5350,11 +5355,11 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs bluetooth="bluetooth" network="NetworkManager" ;; - 11) # Base System: + 11) # Base System: deskpkgs="${basepkgs[*]} networkmanager" network="NetworkManager" ;; - 12) # Custom System: + 12) # Custom System: custarray=(base sudo "${custompkgs}" "${fstools}" "${kernel}" "${microcode}") if [[ "${vendor}" == "Virtual Machine" ]]; then @@ -5380,8 +5385,12 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs if [[ -n "${wireless_reg}" ]]; then custarray+=("${wireless_reg}") fi - deskpkgs="${custarray[*]}" ;; + + 13) # Cosmic Desktop: + deskpkgs="${basepkgs[*]} cosmic networkmanager pipewire-pulse wireplumber" + displaymanager="cosmic-greeter" + network="NetworkManager" ;; esac pkg_displ @@ -5422,7 +5431,7 @@ swapfile() { ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Swapfile Setup${nc} ${magenta}]${nc}-------------------------------------${magenta}### " - if arch-chroot /mnt <<-SWAPFILE > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-SWAPFILE > /dev/null 2>&1 2> amelia_log.txt ; then mkswap -U clear --size ${swapsize}G --file /swapfile || exit SWAPFILE cat >> /mnt/etc/fstab <<-FSTAB || err_abort @@ -5443,7 +5452,7 @@ swapfile_btrfs() { ${magenta}###${nc}----------------------------------${magenta}[ ${bwhite}Btrfs Swapfile Setup${nc} ${magenta}]${nc}----------------------------------${magenta}### " - if arch-chroot /mnt <<-SWAPFILE > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-SWAPFILE > /dev/null 2>&1 2> amelia_log.txt ; then btrfs filesystem mkswapfile --size ${swapsize}g --uuid clear /swap/swapfile || exit SWAPFILE cat >> /mnt/etc/fstab <<-FSTAB || err_abort @@ -5474,7 +5483,7 @@ ${magenta}###${nc}--------------------------${magenta}[ ${bwhite}Setting Up Wire main_chroot() { stage_prompt="Base-System Configuration" - if arch-chroot /mnt <<-CONF > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-CONF > /dev/null 2>&1 2> amelia_log.txt ; then sed -i "/^#${SETLOCALE}/s/^#//" /etc/locale.gen || exit locale-gen || exit echo LANG=${SETLOCALE} > /etc/locale.conf || exit @@ -5510,7 +5519,7 @@ btldrcfg() { if [[ "${bootloader}" == "1" ]]; then local stage_prompt="Systemd-boot Configuration" if [[ "${xbootloader}" == "no" ]]; then - if arch-chroot /mnt <<-BOOTCTL > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-BOOTCTL > /dev/null 2>&1 2> amelia_log.txt ; then bootctl install || exit systemctl enable systemd-boot-update || exit BOOTCTL @@ -5519,7 +5528,7 @@ BOOTCTL stage_fail fi elif [[ "${xbootloader}" == "yes" ]]; then - if arch-chroot /mnt <<-XBOOTCTL > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-XBOOTCTL > /dev/null 2>&1 2> amelia_log.txt ; then bootctl --esp-path=/efi --boot-path=/boot install || exit systemctl enable systemd-boot-update || exit XBOOTCTL @@ -5530,7 +5539,7 @@ XBOOTCTL fi elif [[ "${bootloader}" == "2" ]]; then local stage_prompt="Grub Configuration" - if arch-chroot /mnt <<-GRUB > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-GRUB > /dev/null 2>&1 2> amelia_log.txt ; then cp /etc/default/grub /etc/default/grub.bak || exit cat <<-CFG > /etc/default/grub || exit GRUB_DEFAULT=0 @@ -5555,7 +5564,7 @@ GRUB local stage_prompt="Grub Installation" if [[ "${sb_sign}" == "y" ]]; then - if arch-chroot /mnt <<-SBGRUBINST > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-SBGRUBINST > /dev/null 2>&1 2> amelia_log.txt ; then grub-install --target=${uefimode} --efi-directory=${btldr_esp_mount} --bootloader-id=GRUB --modules="tpm" --disable-shim-lock --recheck || exit sed -i 's/SecureBoot/SecureB00t/' ${btldr_esp_mount}/EFI/GRUB/grubx64.efi || exit grub-mkconfig -o /boot/grub/grub.cfg || exit @@ -5565,7 +5574,7 @@ SBGRUBINST stage_fail fi elif [[ "${sb_sign}" == "n" ]]; then - if arch-chroot /mnt <<-GRUBINST > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-GRUBINST > /dev/null 2>&1 2> amelia_log.txt ; then grub-install --target=${uefimode} --efi-directory=${btldr_esp_mount} --bootloader-id=GRUB --recheck || exit grub-mkconfig -o /boot/grub/grub.cfg || exit GRUBINST @@ -5577,7 +5586,7 @@ GRUBINST if [[ "${fs}" == "2" ]]; then local stage_prompt="Grub-Btrfsd Service Activation" - if arch-chroot /mnt <<-GRUB_BTRFSD > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-GRUB_BTRFSD > /dev/null 2>&1 2> amelia_log.txt ; then systemctl enable grub-btrfsd || exit GRUB_BTRFSD stage_ok @@ -5588,7 +5597,7 @@ GRUB_BTRFSD if [[ "${vgaconf}" == "y" && "${vendor}" == "Nvidia" ]]; then local stage_prompt="Grub/Nvidia Configuration" - if arch-chroot /mnt <<-NVGRUB > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-NVGRUB > /dev/null 2>&1 2> amelia_log.txt ; then sed -i "/^#GRUB_TERMINAL_OUTPUT=console/s/^#//" /etc/default/grub || exit grub-mkconfig -o /boot/grub/grub.cfg || exit NVGRUB @@ -5604,7 +5613,7 @@ trimcfg() { if [[ -n "${trim}" ]]; then local stage_prompt="Trim Service Activation" - if arch-chroot /mnt <<-TRIM > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-TRIM > /dev/null 2>&1 2> amelia_log.txt ; then systemctl enable ${trim} || exit TRIM stage_ok @@ -5618,7 +5627,7 @@ vm_serv() { if [[ -n "${vm_services}" ]]; then local stage_prompt="VM Service(s) Activation" - if arch-chroot /mnt <<-VM > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-VM > /dev/null 2>&1 2> amelia_log.txt ; then systemctl enable ${vm_services} || exit VM stage_ok @@ -5633,7 +5642,7 @@ zramcfg() { if [[ -n "${zram}" ]]; then local stage_prompt="Zram Swap Activation" zram_service="systemd-zram-setup@zram0.service" - if arch-chroot /mnt <<-ZRAMCONF > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-ZRAMCONF > /dev/null 2>&1 2> amelia_log.txt ; then mkdir -p /etc/systemd/zram-generator.conf.d || exit cat <<-ZCONF > /etc/systemd/zram-generator.conf.d/zram.conf || exit [zram0] @@ -5661,7 +5670,7 @@ nvidia_hook() { if [[ "${vgaconf}" == "y" && "${vendor}" == "Nvidia" ]]; then if [[ "${nvname}" == "nvidia-open" ]] || [[ "${nvname}" == "nvidia" ]] || [[ "${nvname}" == "nvidia-lts" ]]; then local stage_prompt="Nvidia Hook Creation" - if arch-chroot /mnt <<-NVIDIAHOOK > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-NVIDIAHOOK > /dev/null 2>&1 2> amelia_log.txt ; then mkdir -p /etc/pacman.d/hooks/ || exit cat <<-HOOK > /etc/pacman.d/hooks/nvidia.hook || exit [Trigger] @@ -5696,7 +5705,7 @@ mkinitcpio_preset() { if [[ ! -e "${esp_mount}"/EFI/Linux ]]; then mkdir -p "${esp_mount}"/EFI/Linux || exit fi - if arch-chroot /mnt <<-UKI > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-UKI > /dev/null 2>&1 2> amelia_log.txt ; then mkdir /etc/cmdline.d || exit echo "rw ${boot_opts}" | tee /etc/cmdline.d/cmdlined.conf || exit cp /etc/mkinitcpio.d/${kernel}.preset /etc/mkinitcpio.d/${kernel}.preset.bak || exit @@ -5721,7 +5730,7 @@ UKI fi elif [[ "${uki}" == "n" ]]; then - if arch-chroot /mnt <<-NOUKI > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-NOUKI > /dev/null 2>&1 2> amelia_log.txt ; then cp /etc/mkinitcpio.d/${kernel}.preset /etc/mkinitcpio.d/${kernel}.preset.bak || exit cat <<-MKINITPRESET > /etc/mkinitcpio.d/${kernel}.preset || exit ALL_kver="/boot/vmlinuz-${kernel}" @@ -5745,7 +5754,7 @@ secboot_sign() { if [[ ${sb_sign} == "y" ]]; then local stage_prompt="Secure-Boot Signing" if [[ ${bootloader} == "1" ]]; then - if arch-chroot /mnt <<-SECSIGN > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-SECSIGN > /dev/null 2>&1 2> amelia_log.txt ; then systemctl disable systemd-boot-update || exit pacman -S --noconfirm sbctl || exit sbctl create-keys || exit @@ -5761,7 +5770,7 @@ SECSIGN stage_fail fi elif [[ ${bootloader} == "2" ]]; then - if arch-chroot /mnt <<-SECSIGN > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-SECSIGN > /dev/null 2>&1 2> amelia_log.txt ; then pacman -S --noconfirm sbctl || exit sbctl create-keys || exit sbctl enroll-keys -m || exit @@ -5940,14 +5949,14 @@ ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Chroot & " # 'Vanilla' Configuration: - if [[ "${packages}" =~ ^(1|3|5|6|7|8|9|10|11)$ ]]; then + if [[ "${packages}" =~ ^(1|3|5|6|7|8|9|10|11|13)$ ]]; then cnfg main_chroot if [[ -f /mnt/etc/lightdm/lightdm.conf ]]; then if [[ "${packages}" == "7" ]]; then local stage_prompt="Deepin Greeter Configuration" - if arch-chroot /mnt <<-DEEPIN > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-DEEPIN > /dev/null 2>&1 2> amelia_log.txt ; then sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-deepin-greeter|g' /etc/lightdm/lightdm.conf || exit DEEPIN stage_ok @@ -5956,7 +5965,7 @@ DEEPIN fi elif [[ "${packages}" == "5" || "${packages}" == "8" || "${packages}" == "10" ]]; then local stage_prompt="GTK Greeter Configuration" - if arch-chroot /mnt <<-GTK > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-GTK > /dev/null 2>&1 2> amelia_log.txt ; then sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-gtk-greeter|g' /etc/lightdm/lightdm.conf || exit GTK stage_ok @@ -5965,7 +5974,7 @@ GTK fi elif [[ "${packages}" == "6" ]]; then local stage_prompt="Slick Greeter Configuration" - if arch-chroot /mnt <<-SLICK > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-SLICK > /dev/null 2>&1 2> amelia_log.txt ; then sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-slick-greeter|g' /etc/lightdm/lightdm.conf || exit SLICK stage_ok @@ -5977,7 +5986,7 @@ SLICK if [[ -n "${bluetooth}" ]]; then local stage_prompt="Bluetooth Service Activation" - if arch-chroot /mnt <<-BLUETOOTH > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-BLUETOOTH > /dev/null 2>&1 2> amelia_log.txt ; then systemctl enable ${bluetooth} || exit BLUETOOTH stage_ok @@ -5988,7 +5997,7 @@ BLUETOOTH if [[ -n "${displaymanager}" ]]; then local stage_prompt="Display Manager Service Activation" - if arch-chroot /mnt <<-DMSERVICE > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-DMSERVICE > /dev/null 2>&1 2> amelia_log.txt ; then systemctl enable ${displaymanager} || exit DMSERVICE stage_ok @@ -5999,7 +6008,7 @@ DMSERVICE if [[ -n "${network}" ]]; then local stage_prompt="Network Manager Service Activation" - if arch-chroot /mnt <<-NETWORK > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-NETWORK > /dev/null 2>&1 2> amelia_log.txt ; then systemctl enable ${network} || exit NETWORK stage_ok @@ -6026,7 +6035,7 @@ NETWORK if [[ -f /mnt/etc/lightdm/lightdm.conf ]]; then if [[ "${greeternmbr}" == "1" ]]; then local stage_prompt="GTK Greeter Configuration" - if arch-chroot /mnt <<-GTK > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-GTK > /dev/null 2>&1 2> amelia_log.txt ; then sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-gtk-greeter|g' /etc/lightdm/lightdm.conf || exit GTK stage_ok @@ -6035,7 +6044,7 @@ GTK fi elif [[ "${greeternmbr}" == "2" ]]; then local stage_prompt="Slick Greeter Configuration" - if arch-chroot /mnt <<-SLICK > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-SLICK > /dev/null 2>&1 2> amelia_log.txt ; then sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-slick-greeter|g' /etc/lightdm/lightdm.conf || exit SLICK stage_ok @@ -6044,7 +6053,7 @@ SLICK fi elif [[ "${greeternmbr}" == "3" ]]; then local stage_prompt="Deepin Greeter Configuration" - if arch-chroot /mnt <<-DEEPIN > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-DEEPIN > /dev/null 2>&1 2> amelia_log.txt ; then sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-deepin-greeter|g' /etc/lightdm/lightdm.conf || exit DEEPIN stage_ok @@ -6056,7 +6065,7 @@ DEEPIN if [[ -n "${customservices}" ]]; then local stage_prompt="Custom Service(s) Activation" - if arch-chroot /mnt <<-CUSTOMSERV > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-CUSTOMSERV > /dev/null 2>&1 2> amelia_log.txt ; then systemctl enable ${customservices} || exit CUSTOMSERV stage_ok @@ -6087,12 +6096,12 @@ CUSTOMSERV fi if [[ -n "${nrg_plc}" ]]; then - arch-chroot /mnt <<-NRG > /dev/null 2>&1 2> error_log.txt + arch-chroot /mnt <<-NRG > /dev/null 2>&1 2> amelia_log.txt ${nrg_plc} performance NRG fi - if arch-chroot /mnt <<-OPTIMIZED > /dev/null 2>&1 2> error_log.txt ; then + if arch-chroot /mnt <<-OPTIMIZED > /dev/null 2>&1 2> amelia_log.txt ; then sed -i "/^#${SETLOCALE}/s/^#//" /etc/locale.gen || exit locale-gen || exit echo LANG=${SETLOCALE} > /etc/locale.conf || exit