From f1d205d04babc3e9465c67fff4817651b9ed5bd7 Mon Sep 17 00:00:00 2001 From: Jane Doe Date: Mon, 25 Aug 2025 00:52:18 +0300 Subject: [PATCH] Change: Many prompts have been edited for better/enhanced visuals Change: 'first_check' function has been splitted into 2 new ones: 'mode-check' & 'set_font' Change: 'Internet connection check' stage is using 'www.archlinux.org' again Change: Many options offered by the installer, are now defaulting to 'No' Change: 'System Configuration' > 'Desktop Setup' > 'Browser Selection': The installer now widens the web browser selection offered, omitting the not-so-used browsers and including big names from the AUR (Brave Browser,Microsoft Edge,Zen Browser,Opera,Google Chrome). Only *-bin browsers (no compiling needed) are -of course- included 1. No AUR-helper will be installed 2. This AUR package will be handled exclusively by makepkg & pacman itself, so everything will be completely under user control Change: 'System Configuration' > 'Desktop Setup' > 'Printer & Scanner Support': The package 'bluez-cups' has been added Add: The packages 'bluez, bluez-utils, bluez-mesh, bluez-obex' have been moved to the main package array Add: If the user keeps skipping the automated-partitioning stages offered, the 'Manual Partitioning' stage will be offered, in a loop --- Amelia.sh | 674 +++++++++++++++++++++++++++++------------------------- 1 file changed, 362 insertions(+), 312 deletions(-) diff --git a/Amelia.sh b/Amelia.sh index 9dc2aa7..deacda7 100644 --- a/Amelia.sh +++ b/Amelia.sh @@ -2,7 +2,7 @@ # Amelia Installer # Source: https://gitlab.com/prism7/archery -# Version: 9.3.2 +# Version: 9.4.0 set -euo pipefail ################################################################################################### @@ -150,7 +150,7 @@ unmount() { ${magenta}###${nc}-----------------------------------${magenta}[ ${bwhite}Unmount Filesystems${nc} ${magenta}]${nc}-----------------------------------${magenta}### " - if umount -R /mnt > ${void} 2>&1 ; then + if umount -R /mnt > "${void}" 2>&1 ; then sleep 0.2 NC " @@ -217,8 +217,10 @@ stage_ok() { } stage_fail() { sleep 0.2 - line2 - REDBG " ${yellow}[!] ${stage_prompt} FAILED [!]" + NC " + +==> [${red}[!] ${stage_prompt} FAILED!${nc}] + " failure } completion_err() { @@ -229,7 +231,7 @@ completion_err() { (*) ${nc}Please complete${yellowl} '${stage_prompt}' ${nc}to continue - "| pv -qL 70 + " | pv -qL 70 else sleep 0.2 CYAN " @@ -314,7 +316,7 @@ nvidia() { } arch() { sleep 0.2 - line3 + echo BLUEBG "************************************************************************************************* " BLUEBG " " BLUEBG " ##### Archlinux Installation ##### " @@ -322,12 +324,24 @@ arch() { BLUEBG "************************************************************************************************* " line2 } +installing() { + sleep 0.2 + line3 + MAGENTABG "------------------------------------------------------------------------------------------------- " + MAGENTABG " ### Installing System ### " + MAGENTABG "------------------------------------------------------------------------------------------------- " + line3 +} cnfg() { sleep 0.2 line3 MAGENTABG "------------------------------------------------------------------------------------------------- " - MAGENTABG " ### Configuring ### " + MAGENTABG " ### Configuring System ### " MAGENTABG "------------------------------------------------------------------------------------------------- " + MAGENTA " + + + ... Please Wait ... " line3 } completion() { @@ -349,7 +363,7 @@ failure() { REDBG " " REDBG "************************************************************************************************* " line3 - umount -R /mnt > ${void} 2>&1 + umount -R /mnt > "${void}" 2>&1 if [[ "${luks_root}" == "ok" || "${luks_swap}" == "ok" || "${luks_home}" == "ok" ]] && [[ "${installation}" != "ok" ]]; then force_reboot fi @@ -358,14 +372,29 @@ failure() { # END PROMPT FUNCTIONS ################################################################################################### # FUNCTIONS -first_check() { +mode_check() { + + if [[ "${run_as}" == "root" ]]; then + sleep 0.2 + NC " + + ${cyan}* ${nc}Running in ${red}ROOT ${nc}mode ${cyan}* " + else + sleep 0.2 + NC " + + ${cyan}* ${nc}Running in ${blue}DEMO ${nc}mode ${cyan}* " + fi +} +################################################################################################### +set_font() { if [[ -f /usr/share/kbd/consolefonts/ter-v18b.psf.gz && -f /usr/share/kbd/consolefonts/ter-v32b.psf.gz ]]; then if [[ "${tty}" == *"tty"* && "${run_as}" == "root" ]]; then until slct_font; do : ; done else if [[ -e /usr/bin/pv ]]; then - MAGENTABG " 'Terminus Font' detected ==> Log in as 'root' in a tty & re-run to enable "| pv -qL 70 + MAGENTABG " 'Terminus Font' detected ==> Log in as 'root' in a tty & re-run to enable " | pv -qL 70 echo else MAGENTABG " 'Terminus Font' detected ==> Log in as 'root' in a tty & re-run to enable " @@ -373,23 +402,11 @@ first_check() { fi fi fi - - if [[ "${run_as}" == "root" ]]; then - REDBG " ${yellow}---------------------------------------- " - REDBG " ${yellow}### The Installer Runs In ROOT Mode ### " - REDBG " ${yellow}---------------------------------------- " - else - YELLOWBG " ---------------------------------------- " - YELLOWBG " ### The Installer Runs In DEMO Mode ### " - YELLOWBG " ---------------------------------------- " - line2 - REDBG " ${yellow}### Some actions requiring Root access will terminate the demo with a 'FAILED' warning ### " - fi } ################################################################################################### slct_font() { - sleep 0.2 + clear NC " @@ -420,6 +437,9 @@ Enter a number: " invalid return 1 ;; esac + local prompt="Fonts" + ok + sleep 0.7 clear } ################################################################################################### @@ -457,7 +477,7 @@ connection_check() { ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Internet Connection Check${nc} ${magenta}]${nc}--------------------------------${magenta}### " - if ping -c 3 google.com > ${void} 2>&1; then + if ping -c 3 archlinux.org > "${void}" 2>&1; then ok else RED " @@ -573,12 +593,12 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}M if [[ -e /usr/bin/pv ]]; then CYAN " - (*) ${nc}Select ${bwhite}[4] ${nc}to utilize ${yellowl}'Assisted Navigation' ${nc}& ${yellowl}'Smart Partitioning' ${nc}features + * ${nc}Select ${bwhite}[4] ${nc}for ${yellowl}Auto-Navigation " | pv -qL 70 else CYAN " - (*) ${nc}Select ${bwhite}[4] ${nc}to utilize ${yellowl}'Assisted Navigation' ${nc}& ${yellowl}'Smart Partitioning' ${nc}features + * ${nc}Select ${bwhite}[4] ${nc}for ${yellowl}Auto-Navigation " fi NC " @@ -782,7 +802,7 @@ Enter your keyboard layout ${bwhite}(empty for 'us')${blue}: " ### ${SETKBD} Keyboard Layout has been selected " - loadkeys "${SETKBD}" > ${void} 2> ${log} || stage_fail + loadkeys "${SETKBD}" > "${void}" 2> "${log}" || stage_fail fi ok } @@ -1140,21 +1160,21 @@ ${magenta}###${nc}-----------------------------------${magenta}[ ${bwhite}Secure " YELLOW " - > Sign UKI(s), Kernel & binaries for use with ${nc}Secure Boot ${yellow}? [Y/n]" + > Sign UKI(s), Kernel & binaries for use with ${nc}Secure Boot ${yellow}? [y/N]" BLUE " -Enter [Y/n]: " +Enter [y/N]: " read -r -p " ==> " sb_sign echo - sb_sign="${sb_sign:-y}" + sb_sign="${sb_sign:-n}" sb_sign="${sb_sign,,}" if [[ "${sb_sign}" == "y" ]]; then local prompt="Secure Boot 'Setup' Mode Verification" - SB_Status="$(bootctl status 2> ${void} | grep -E 'Secure Boot' | awk "{print \$4}")" + SB_Status="$(bootctl status 2> "${void}" | grep -E 'Secure Boot' | awk "{print \$4}")" if [[ ${SB_Status} == "(setup)" ]]; then ok else @@ -1360,16 +1380,16 @@ Enter a number: " - > Make use of a ${nc}dedicated ${yellow}/Home Partition ? [Y/n] " + > Make use of a ${nc}dedicated ${yellow}/Home Partition ? [y/N] " BLUE " -Enter [Y/n]: " +Enter [y/N]: " read -r -p " ==> " sep_home echo - sep_home="${sep_home:-y}" + sep_home="${sep_home:-n}" sep_home="${sep_home,,}" case "${sep_home}" in @@ -1510,6 +1530,9 @@ Enter a number: " set_swapsize() { local prompt="Swapsize" + YELLOW " + + ### Set Swap size (integers only eg. 1,4,8,16,34) " BLUE " Enter Swap size ${bwhite}(in GB)${blue}: " @@ -2362,19 +2385,14 @@ Enter [Y/n]: " ################################################################################################### web_browser() { - if [[ "${desktop}" =~ ^(11|12)$ ]] && [[ -n "${revision}" ]]; then - web_browser="" - web_slct="" - return 0 - fi sleep 0.2 NC " ${magenta}###${nc}----------------------------------${magenta}[ ${bwhite}Web browser Selection${nc} ${magenta}]${nc}----------------------------------${magenta}### " - local prompt="Web Browser" - if [[ ! "${desktop}" =~ ^(11|12)$ ]]; then + + if [[ ! "${desktop}" =~ ^(11|12)$ && -n "${desktop}" ]]; then sleep 0.2 YELLOW " @@ -2392,11 +2410,15 @@ ${magenta}###${nc}----------------------------------${magenta}[ ${bwhite}Web bro [3] Vivaldi - [4] Tor Browser + [4] Brave Browser - [5] Falkon + [5] Microsoft Edge - [6] Qutebrowser " + [6] Zen Browser + + [7] Opera + + [8] Google Chrome " BLUE " @@ -2404,34 +2426,35 @@ Enter a number ${bwhite}(empty to skip)${blue}: " read -r -p " ==> " web - local prompt="Web Browser" case "${web}" in 1) - web_browser="firefox" - web_slct="yes" - ok ;; + web_pkg="firefox" + web_name="Firefox" ;; 2) - web_browser="chromium" - web_slct="yes" - ok ;; + web_pkg="chromium" + web_name="Chromium" ;; 3) - web_browser="vivaldi" - web_slct="yes" - ok ;; + web_pkg="vivaldi" + web_name="Vivaldi" ;; 4) - web_browser="torbrowser-launcher" - web_slct="yes" - ok ;; + web_foreign="brave-bin" + web_name="Brave Browser" ;; 5) - web_browser="falkon" - web_slct="yes" - ok ;; + web_foreign="microsoft-edge-stable-bin" + web_name="Microsoft Edge" ;; 6) - web_browser="qutebrowser" - web_slct="yes" - ok ;; + web_foreign="zen-browser-bin" + web_name="Zen Browser" ;; + 7) + web_foreign="opera" + web_name="Opera" ;; + 8) + web_foreign="google-chrome" + web_name="Google Chrome" ;; "") - web_browser="" + web_pkg="" + web_foreign="" + web_name="" web_slct="yes" skip ;; *) @@ -2451,7 +2474,9 @@ Enter a number ${bwhite}(empty to skip)${blue}: " ### No Browser selected " - web_browser="" + web_pkg="" + web_foreign="" + web_name="" web_slct="" skip NC " @@ -2463,6 +2488,12 @@ Enter a number ${bwhite}(empty to skip)${blue}: " " read -r -s -n 1 fi + + if [[ "${web}" =~ ^(1|2|3|4|5|6|7|8)$ ]]; then + local prompt="${web_name}" + web_slct="yes" + ok + fi } ################################################################################################### print_scan() { @@ -2475,7 +2506,7 @@ ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Printer & " local prompt="Printer & Scanner Support" if [[ "${hypervisor}" == "none" ]]; then - if [[ ! "${desktop}" =~ ^(11|12)$ ]]; then + if [[ ! "${desktop}" =~ ^(11|12)$ && -n "${desktop}" ]]; then sleep 0.2 YELLOW " @@ -2498,11 +2529,11 @@ Enter [Y/n]: " case "${printer}" in y) if [[ "${desktop}" == "2" ]]; then - print_pkgs="cups-pdf cups-browsed cups-pk-helper ipp-usb nss-mdns sane-airscan print-manager skanlite system-config-printer xdg-utils colord" + print_pkgs="bluez-cups cups-pdf cups-browsed cups-pk-helper ipp-usb nss-mdns sane-airscan print-manager skanlite system-config-printer xdg-utils colord" elif [[ "${desktop}" == "4" ]]; then - print_pkgs="cups-pdf cups-browsed cups-pk-helper ipp-usb nss-mdns sane-airscan simple-scan system-config-printer xdg-utils colord" + print_pkgs="bluez-cups cups-pdf cups-browsed cups-pk-helper ipp-usb nss-mdns sane-airscan simple-scan system-config-printer xdg-utils colord" else - print_pkgs="cups-pdf cups-browsed cups-pk-helper ipp-usb nss-mdns sane-airscan system-config-printer xdg-utils colord" + print_pkgs="bluez-cups cups-pdf cups-browsed cups-pk-helper ipp-usb nss-mdns sane-airscan system-config-printer xdg-utils colord" fi ok ;; n) @@ -2565,7 +2596,7 @@ ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}EFI Boot " YELLOW " - > Select an EFI Boot Entry to Delete ${red}[!] ${nc}(${yellow}CAUTION${nc}) ${red}[!] + > Select an EFI Boot Entry to Delete ${red}[!] (CAUTION) [!] " @@ -2578,7 +2609,8 @@ ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}EFI Boot BLUE " -Enter a Boot Entry number for Deletion ${bwhite}(empty to skip)${blue}: +Enter a Boot Entry number for Deletion ${bwhite}(empty to skip)${blue}: + ${cyan}Entries: ${yellow}${entrnmbr} " read -r -p " ==> " boot_entry @@ -2776,15 +2808,15 @@ ${magenta}###${nc}------------------------------------${magenta}[ ${bwhite}Syste - > Disable ${nc}Watchdogs ${yellow}in the installed system ? [Y/n] " + > Disable ${nc}Watchdogs ${yellow}in the installed system ? [y/N] " BLUE " -Enter [Y/n]: " +Enter [y/N]: " read -r -p " ==> " kill_watchdog - kill_watchdog="${kill_watchdog:-y}" + kill_watchdog="${kill_watchdog:-n}" kill_watchdog="${kill_watchdog,,}" case "${kill_watchdog}" in @@ -2818,15 +2850,15 @@ ${magenta}###${nc}----------------------------------${magenta}[ ${bwhite}General - > Enable System Optimizations ? [Y/n/v] " + > Enable System Optimizations ? [v/y/N] " BLUE " -Enter [Y/n/v]: " +Enter [v/y/N]: " read -r -p " ==> " genoptm - genoptm="${genoptm:-y}" + genoptm="${genoptm:-n}" genoptm="${genoptm,,}" case "${genoptm}" in @@ -2898,7 +2930,7 @@ Enter your Country Code, ie:${nc} ${cyan}US ${bwhite}(empty to skip)${blue}: " ------------------------------------------------------" reload return 1 - elif ! grep \""${REGDOM}"\" /etc/conf.d/wireless-regdom > ${void} 2>&1 ; then + elif ! grep \""${REGDOM}"\" /etc/conf.d/wireless-regdom > "${void}" 2>&1 ; then invalid return 1 else @@ -2931,7 +2963,7 @@ ${magenta}###${nc}-----------------------------------${magenta}[ ${bwhite}System - > Enable ${nc}'systemd-oomd' ${yellow} ? [Y/n] " + > Enable ${nc}'systemd-oomd' ${yellow} ? [y/N] " RED " ------------------------------------------------------------------------ @@ -2940,12 +2972,12 @@ ${magenta}###${nc}-----------------------------------${magenta}[ ${bwhite}System BLUE " -Enter [Y/n]: " +Enter [y/N]: " read -r -p " ==> " oomd echo - oomd="${oomd:-y}" + oomd="${oomd:-n}" oomd="${oomd,,}" if [[ "${oomd}" == "y" ]]; then @@ -2981,16 +3013,16 @@ ${magenta}###${nc}------------------------------------${magenta}[ ${bwhite}Irqba - > Install & enable ${nc}'irqbalance' ${yellow} ? [Y/n] " + > Install & enable ${nc}'irqbalance' ${yellow} ? [y/N] " BLUE " -Enter [Y/n]: " +Enter [y/N]: " read -r -p " ==> " irqbalance echo - irqbalance="${irqbalance:-y}" + irqbalance="${irqbalance:-n}" irqbalance="${irqbalance,,}" if [[ "${irqbalance}" == "y" ]]; then @@ -3026,16 +3058,16 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Ther - > Install & enable ${nc}'thermald' ${yellow} ? [Y/n] " + > Install & enable ${nc}'thermald' ${yellow} ? [y/N] " BLUE " -Enter [Y/n]: " +Enter [y/N]: " read -r -p " ==> " thermald echo - thermald="${thermald:-y}" + thermald="${thermald:-n}" thermald="${thermald,,}" if [[ "${thermald}" == "y" ]]; then @@ -3071,16 +3103,16 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Rng- - > Install & enable ${nc}'rngd' ${yellow} ? [Y/n] " + > Install & enable ${nc}'rngd' ${yellow} ? [y/N] " BLUE " -Enter [Y/n]: " +Enter [y/N]: " read -r -p " ==> " rngd echo - rngd="${rngd:-y}" + rngd="${rngd:-n}" rngd="${rngd,,}" if [[ "${rngd}" == "y" ]]; then @@ -3116,16 +3148,16 @@ ${magenta}###${nc}---------------------------------------${magenta}[ ${bwhite}Rt - > Install & enable ${nc}'rtkit' ${yellow} ? [Y/n] " + > Install & enable ${nc}'rtkit' ${yellow} ? [y/N] " BLUE " -Enter [Y/n]: " +Enter [y/N]: " read -r -p " ==> " rtkit echo - rtkit="${rtkit:-y}" + rtkit="${rtkit:-n}" rtkit="${rtkit,,}" if [[ "${rtkit}" == "y" ]]; then @@ -3314,15 +3346,15 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Mult ### If ${nc}'(y)es'${yellow} then: " - RED " + CYAN " ---------------------------------------------------------- - ### ${yellow}Your ${nc}EFI ${yellow}System Partition (ESP) will stay ${nc}intact ${red}### + ### ${yellowl}Your ${bwhite}EFI ${yellowl}System Partition (ESP) will stay ${bwhite}intact ${nc}${cyan}### ---------------------------------------------------------- - ------------------------------------------------------------------------------- - ### ${yellow}Only ${nc}'Manual' ${yellow}Disk Partitioning will be available for ${nc}Disk Management ${red}### - -------------------------------------------------------------------------------" + ----------------------------------------------------------------------------- + ### ${yellowl}Only ${bwhite}Manual ${yellowl}Disk Partitioning will be available for ${bwhite}Disk Management ${nc}${cyan}### + -----------------------------------------------------------------------------" BLUE " @@ -3571,6 +3603,9 @@ Enter a Preset number ${bwhite}(empty to skip)${blue}: " if [[ "${preset}" =~ ^(1|2|3|4)$ ]]; then presetpart="y" + elif [[ -z "${preset}" && "${partok}" == "n" ]]; then + alternatives + manual_part elif [[ -z "${preset}" ]]; then skip else @@ -3589,15 +3624,16 @@ set_partsize() { ### Total detected capacity of disk ${nc}${sgdrive} ${yellow}is ${nc}${cap_gib} GiB${yellow} - ### Default ${nc}/Root${yellow} Partition's size is aprox. ${nc}25%${yellow} of total disk capacity ${nc}[${rootsize} GiB]${yellow} + ### Default ${nc}Root${yellow} partition's size is aprox. ${nc}25%${yellow} of total disk capacity + + ### Current ${nc}Root${yellow} partition's size is ${nc}[${rootsize} GiB]${yellow} - - > Set /Root Partition's Percentage to a custom value ? " + > Adjust Root Partition's size (by setting a custom percentage value) ? " BLUE " -Enter a Custom Percentage number ${nc}e.g. 30 ${bwhite}(empty to skip)${blue}: " +Enter Percentage value ${nc}eg. 40 ${bwhite}(empty to skip)${blue}: " read -r -p " ==> " prcnt echo @@ -3614,14 +3650,14 @@ Enter a Custom Percentage number ${nc}e.g. 30 ${bwhite}(empty to skip)${blue}: " sleep 0.2 YELLOW " - ### Default /Root Partition's size selected ${nc}[${rootsize} GiB] + ### Default Root Partition's size selected ${nc}[${rootsize} GiB] " elif [[ "${prcnt}" -gt "0" && "${prcnt}" -lt "100" ]]; then rootsize="$((capacity*"${prcnt}"/100/1024000000))" sleep 0.2 YELLOW " - ### Custom /Root Partition's size selected ${nc}[${rootsize} GiB] + ### Custom Root Partition's size selected ${nc}[${rootsize} GiB] " elif [[ "${prcnt}" == "100" ]]; then sleep 0.2 @@ -3651,11 +3687,11 @@ partitioner() { fi if [[ "${preset}" == "1" ]]; then - wipefs -af "${sgdrive}" > ${void} 2> ${log} || stage_fail - sgdisk -o "${sgdrive}" > ${void} 2> ${log} || stage_fail - sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > ${void} 2> ${log} || stage_fail - sgdisk -I -n2:0:0 -t2:8304 -c2:ROOT "${sgdrive}" > ${void} 2> ${log} || stage_fail - partprobe -s "${sgdrive}" > ${void} 2> ${log} || stage_fail + wipefs -af "${sgdrive}" > "${void}" 2> "${log}" || stage_fail + sgdisk -o "${sgdrive}" > "${void}" 2> "${log}" || stage_fail + sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > "${void}" 2> "${log}" || stage_fail + sgdisk -I -n2:0:0 -t2:8304 -c2:ROOT "${sgdrive}" > "${void}" 2> "${log}" || stage_fail + partprobe -s "${sgdrive}" > "${void}" 2> "${log}" || stage_fail if [[ "${install}" == "yes" ]]; then until sanity_check; do : ; done else @@ -3663,38 +3699,38 @@ partitioner() { fi elif [[ "${preset}" == "2" ]]; then until set_swapsize; do : ; done - wipefs -af "${sgdrive}" > ${void} 2> ${log} || stage_fail - sgdisk -o "${sgdrive}" > ${void} 2> ${log} || stage_fail - sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > ${void} 2> ${log} || stage_fail - sgdisk -I -n2:0:+"${swapsize}"G -t2:8200 -c2:SWAP "${sgdrive}" > ${void} 2> ${log} || stage_fail - sgdisk -I -n3:0:0 -t3:8304 -c3:ROOT "${sgdrive}" > ${void} 2> ${log} || stage_fail - partprobe -s "${sgdrive}" > ${void} 2> ${log} || stage_fail + wipefs -af "${sgdrive}" > "${void}" 2> "${log}" || stage_fail + sgdisk -o "${sgdrive}" > "${void}" 2> "${log}" || stage_fail + sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > "${void}" 2> "${log}" || stage_fail + sgdisk -I -n2:0:+"${swapsize}"G -t2:8200 -c2:SWAP "${sgdrive}" > "${void}" 2> "${log}" || stage_fail + sgdisk -I -n3:0:0 -t3:8304 -c3:ROOT "${sgdrive}" > "${void}" 2> "${log}" || stage_fail + partprobe -s "${sgdrive}" > "${void}" 2> "${log}" || stage_fail if [[ "${install}" == "yes" ]]; then until sanity_check; do : ; done else ok fi elif [[ "${preset}" == "3" ]]; then - wipefs -af "${sgdrive}" > ${void} 2> ${log} || stage_fail - sgdisk -o "${sgdrive}" > ${void} 2> ${log} || stage_fail - sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > ${void} 2> ${log} || stage_fail - sgdisk -I -n2:0:+"${rootsize}"G -t2:8304 -c2:ROOT "${sgdrive}" > ${void} 2> ${log} || stage_fail - sgdisk -I -n3:0:0 -t3:8302 -c3:HOME "${sgdrive}" > ${void} 2> ${log} || stage_fail - partprobe -s "${sgdrive}" > ${void} 2> ${log} || stage_fail + wipefs -af "${sgdrive}" > "${void}" 2> "${log}" || stage_fail + sgdisk -o "${sgdrive}" > "${void}" 2> "${log}" || stage_fail + sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > "${void}" 2> "${log}" || stage_fail + sgdisk -I -n2:0:+"${rootsize}"G -t2:8304 -c2:ROOT "${sgdrive}" > "${void}" 2> "${log}" || stage_fail + sgdisk -I -n3:0:0 -t3:8302 -c3:HOME "${sgdrive}" > "${void}" 2> "${log}" || stage_fail + partprobe -s "${sgdrive}" > "${void}" 2> "${log}" || stage_fail if [[ "${install}" == "yes" ]]; then until sanity_check; do : ; done else ok fi elif [[ "${preset}" == "4" ]]; then - wipefs -af "${sgdrive}" > ${void} 2> ${log} || stage_fail + wipefs -af "${sgdrive}" > "${void}" 2> "${log}" || stage_fail until set_swapsize; do : ; done - sgdisk -o "${sgdrive}" > ${void} 2> ${log} || stage_fail - sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > ${void} 2> ${log} || stage_fail - sgdisk -I -n2:0:+"${swapsize}"G -t2:8200 -c2:SWAP "${sgdrive}" > ${void} 2> ${log} || stage_fail - sgdisk -I -n3:0:+"${rootsize}"G -t3:8304 -c3:ROOT "${sgdrive}" > ${void} 2> ${log} || stage_fail - sgdisk -I -n4:0:0 -t4:8302 -c4:HOME "${sgdrive}" > ${void} 2> ${log} || stage_fail - partprobe -s "${sgdrive}" > ${void} 2> ${log} || stage_fail + sgdisk -o "${sgdrive}" > "${void}" 2> "${log}" || stage_fail + sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > "${void}" 2> "${log}" || stage_fail + sgdisk -I -n2:0:+"${swapsize}"G -t2:8200 -c2:SWAP "${sgdrive}" > "${void}" 2> "${log}" || stage_fail + sgdisk -I -n3:0:+"${rootsize}"G -t3:8304 -c3:ROOT "${sgdrive}" > "${void}" 2> "${log}" || stage_fail + sgdisk -I -n4:0:0 -t4:8302 -c4:HOME "${sgdrive}" > "${void}" 2> "${log}" || stage_fail + partprobe -s "${sgdrive}" > "${void}" 2> "${log}" || stage_fail if [[ "${install}" == "yes" ]]; then until sanity_check; do : ; done else @@ -3713,28 +3749,18 @@ ${magenta}###${nc}-----------------------------------${magenta}[ ${bwhite}Manual " cgdsk_nmbr=" " while [[ -n "${cgdsk_nmbr}" ]]; do - line3 - NC " SUPPORTED PARTITION TYPES & MOUNTPOINTS: " line2 - REDBG " ------------------------------------------------------------------------------------------- " - REDBG " ### Linux Root x86-64 Partition [ GUID Code: 8304 ] Mountpoint: / ### " - REDBG " ------------------------------------------------------------------------------------------- " + NC " Supported Partition Types & Mountpoints: " + line3 + RED " Linux Root x86-64 Partition ${nc} [ GUID Code: 8304 ] ${red}Mountpoint: ${nc}/ " echo - BLUEBG " ------------------------------------------------------------------------------------------- " - BLUEBG " ### EFI System Partition [ GUID Code: ef00 ] Mountpoint: /efi or /boot ### " - BLUEBG " ------------------------------------------------------------------------------------------- " + BLUE " EFI System Partition ${nc} [ GUID Code: ef00 ] ${blue}Mountpoint: ${nc}/efi or /boot " echo - GREENBG " ------------------------------------------------------------------------------------------- " - GREENBG " ### Linux Home Partition [ GUID Code: 8302 ] Mountpoint: /home ### " - GREENBG " ------------------------------------------------------------------------------------------- " + GREEN " Linux Home Partition ${nc} [ GUID Code: 8302 ] ${green}Mountpoint: ${nc}/home " echo - YELLOWBG " ------------------------------------------------------------------------------------------- " - YELLOWBG " ### Linux Swap Partition [ GUID Code: 8200 ] Mountpoint: /swap ### " - YELLOWBG " ------------------------------------------------------------------------------------------- " + YELLOW " Linux Swap Partition ${nc} [ GUID Code: 8200 ] ${yellow}Mountpoint: ${nc}/swap " echo - MAGENTABG " ------------------------------------------------------------------------------------------- " - MAGENTABG " ### Linux Extended Boot Partition [ GUID Code: ea00 ] Mountpoint: /boot ### " - MAGENTABG " ------------------------------------------------------------------------------------------- " + MAGENTA " Linux Extended Boot Partition ${nc} [ GUID Code: ea00 ] ${magenta}Mountpoint: ${nc}/boot " YELLOW " @@ -3767,7 +3793,7 @@ Enter a disk number ${bwhite}(empty to skip)${blue}: " cgdisk "${cgdrive}" clear ok - partprobe -s "${cgdrive}" > ${void} + partprobe -s "${cgdrive}" > "${void}" else invalid return 1 @@ -4699,7 +4725,7 @@ instl() { (*) ${nc}Please complete ${yellowl}'Locale & Keyboard Layout Selection'${nc} to continue - "| pv -qL 70 + " | pv -qL 70 else sleep 0.2 CYAN " @@ -4819,7 +4845,7 @@ swappart() { NC " ${magenta}###${nc}----------------------------------${magenta}[ ${bwhite}Swap Partition Setup${nc} ${magenta}]${nc}----------------------------------${magenta}### " - if mkswap "${swap_dev}" > ${void} 2> ${log} ; then + if mkswap "${swap_dev}" > "${void}" 2> "${log}" ; then stage_ok else stage_fail @@ -4921,9 +4947,9 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A " if [[ "${fs}" == "1" ]]; then - if mkfs.ext4 -F -L Root "${root_dev}" > ${void} 2> ${log} ; then - tune2fs -O fast_commit "${root_dev}" > ${void} 2> ${log} || err_abort - mount "${root_dev}" /mnt > ${void} 2> ${log} || err_abort + if mkfs.ext4 -F -L Root "${root_dev}" > "${void}" 2> "${log}" ; then + tune2fs -O fast_commit "${root_dev}" > "${void}" 2> "${log}" || err_abort + mount "${root_dev}" /mnt > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " ==> [${green}/Root OK${nc}] @@ -4935,27 +4961,27 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A fi #-------------------------------------------------------------------------------------------------- elif [[ "${fs}" == "2" ]]; then - if mkfs.btrfs -f -L Root "${root_dev}" > ${void} 2> ${log} ; then - mount "${root_dev}" /mnt > ${void} 2> ${log} || err_abort - btrfs subvolume create /mnt/@ > ${void} 2> ${log} || err_abort - btrfs subvolume create /mnt/@home > ${void} 2> ${log} || err_abort - btrfs subvolume create /mnt/@cache > ${void} 2> ${log} || err_abort - btrfs subvolume create /mnt/@log > ${void} 2> ${log} || err_abort - btrfs subvolume create /mnt/@tmp > ${void} 2> ${log} || err_abort - btrfs subvolume create /mnt/@snapshots > ${void} 2> ${log} || err_abort + if mkfs.btrfs -f -L Root "${root_dev}" > "${void}" 2> "${log}" ; then + mount "${root_dev}" /mnt > "${void}" 2> "${log}" || err_abort + btrfs subvolume create /mnt/@ > "${void}" 2> "${log}" || err_abort + btrfs subvolume create /mnt/@home > "${void}" 2> "${log}" || err_abort + btrfs subvolume create /mnt/@cache > "${void}" 2> "${log}" || err_abort + btrfs subvolume create /mnt/@log > "${void}" 2> "${log}" || err_abort + btrfs subvolume create /mnt/@tmp > "${void}" 2> "${log}" || err_abort + btrfs subvolume create /mnt/@snapshots > "${void}" 2> "${log}" || err_abort if [[ "${swapmode}" == "2" ]]; then - btrfs subvolume create /mnt/@swap > ${void} 2> ${log} || err_abort + btrfs subvolume create /mnt/@swap > "${void}" 2> "${log}" || err_abort fi - umount /mnt > ${void} 2> ${log} || err_abort - mount -o "${sbvl_mnt_opts}",subvol=@ "${root_dev}" /mnt > ${void} 2> ${log} || err_abort + umount /mnt > "${void}" 2> "${log}" || err_abort + mount -o "${sbvl_mnt_opts}",subvol=@ "${root_dev}" /mnt > "${void}" 2> "${log}" || err_abort if [[ "${swapmode}" == "2" ]]; then - mount --mkdir -o rw,nodatacow,subvol=@swap "${root_dev}" /mnt/swap > ${void} 2> ${log} || err_abort + mount --mkdir -o rw,nodatacow,subvol=@swap "${root_dev}" /mnt/swap > "${void}" 2> "${log}" || err_abort fi - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache "${root_dev}" /mnt/var/cache > ${void} 2> ${log} || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home "${root_dev}" /mnt/home > ${void} 2> ${log} || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log "${root_dev}" /mnt/var/log > ${void} 2> ${log} || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@snapshots "${root_dev}" /mnt/"${snapname}" > ${void} 2> ${log} || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@tmp "${root_dev}" /mnt/var/tmp > ${void} 2> ${log} || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache "${root_dev}" /mnt/var/cache > "${void}" 2> "${log}" || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home "${root_dev}" /mnt/home > "${void}" 2> "${log}" || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log "${root_dev}" /mnt/var/log > "${void}" 2> "${log}" || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@snapshots "${root_dev}" /mnt/"${snapname}" > "${void}" 2> "${log}" || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@tmp "${root_dev}" /mnt/var/tmp > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " ==> [${green}/@ OK${nc}] @@ -4969,8 +4995,8 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A sleep 0.2 #-------------------------------------------------------------------------------------------------- if [[ "${multibooting}" == "n" ]]; then - if mkfs.fat -F 32 -n ESP "${esp_dev}" > ${void} 2> ${log} ; then - mount --mkdir "${esp_dev}" "${esp_mount}" > ${void} 2> ${log} || err_abort + if mkfs.fat -F 32 -n ESP "${esp_dev}" > "${void}" 2> "${log}" ; then + mount --mkdir "${esp_dev}" "${esp_mount}" > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " ==> [${green}/ESP OK${nc}] @@ -4982,7 +5008,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}" > ${void} 2> ${log} ; then + if mount --mkdir "${esp_dev}" "${esp_mount}" > "${void}" 2> "${log}" ; then sleep 0.2 NC " ==> [${green}Unformatted /ESP OK${nc}] @@ -4993,8 +5019,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}" > ${void} 2> ${log} ; then - mount --mkdir "${esp_dev}" "${esp_mount}" > ${void} 2> ${log} || err_abort + if mkfs.fat -F 32 -n ESP "${esp_dev}" > "${void}" 2> "${log}" ; then + mount --mkdir "${esp_dev}" "${esp_mount}" > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " ==> [${green}/ESP OK${nc}] @@ -5009,8 +5035,8 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A sleep 0.2 #-------------------------------------------------------------------------------------------------- if [[ ${xbootloader} == "yes" ]]; then - if mkfs.fat -F 32 -n XBOOTLDR "${xboot_dev}" > ${void} 2> ${log} ; then - mount --mkdir "${xboot_dev}" /mnt/boot > ${void} 2> ${log} || err_abort + if mkfs.fat -F 32 -n XBOOTLDR "${xboot_dev}" > "${void}" 2> "${log}" ; then + mount --mkdir "${xboot_dev}" /mnt/boot > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " ==> [${green}/XBOOTLDR OK${nc}] @@ -5046,9 +5072,9 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A fi if [[ "${homeform}" == "y" ]]; then - if mkfs.ext4 -F -L Home "${home_dev}" > ${void} 2> ${log} ; then - tune2fs -O fast_commit "${home_dev}" > ${void} 2> ${log} || err_abort - mount --mkdir "${home_dev}" /mnt/home > ${void} 2> ${log} || err_abort + if mkfs.ext4 -F -L Home "${home_dev}" > "${void}" 2> "${log}" ; then + tune2fs -O fast_commit "${home_dev}" > "${void}" 2> "${log}" || err_abort + mount --mkdir "${home_dev}" /mnt/home > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " ==> [${green}/Home OK${nc}] @@ -5124,7 +5150,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}" > ${void} 2> ${log} ; then + if mkfs.fat -F 32 -n ESP "${esppart}" > "${void}" 2> "${log}" ; then sleep 0.2 NC " @@ -5143,7 +5169,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}" > ${void} 2> ${log} ; then + if mkfs.fat -F 32 -n ESP "${esppart}" > "${void}" 2> "${log}" ; then sleep 0.2 NC " @@ -5197,7 +5223,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}" > ${void} 2> ${log} ; then + if mkfs.fat -F 32 -n XBOOTLDR "${xbootpart}" > "${void}" 2> "${log}" ; then sleep 0.2 NC " @@ -5252,8 +5278,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}" > ${void} 2> ${log} ; then - tune2fs -O fast_commit "${rootpart}" > ${void} 2> ${log} || err_abort + if mkfs.ext4 -F "${rootpart}" > "${void}" 2> "${log}" ; then + tune2fs -O fast_commit "${rootpart}" > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " @@ -5267,18 +5293,18 @@ Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: " fi #-------------------------------------------------------------------------------------------------- elif [[ "${fs}" == "2" ]]; then - if mkfs.btrfs -f "${rootpart}" > ${void} 2> ${log} ; then - mount "${rootpart}" /mnt > ${void} 2> ${log} || err_abort - btrfs subvolume create /mnt/@ > ${void} 2> ${log} || err_abort - btrfs subvolume create /mnt/@home > ${void} 2> ${log} || err_abort - btrfs subvolume create /mnt/@cache > ${void} 2> ${log} || err_abort - btrfs subvolume create /mnt/@log > ${void} 2> ${log} || err_abort - btrfs subvolume create /mnt/@tmp > ${void} 2> ${log} || err_abort - btrfs subvolume create /mnt/@snapshots > ${void} 2> ${log} || err_abort + if mkfs.btrfs -f "${rootpart}" > "${void}" 2> "${log}" ; then + mount "${rootpart}" /mnt > "${void}" 2> "${log}" || err_abort + btrfs subvolume create /mnt/@ > "${void}" 2> "${log}" || err_abort + btrfs subvolume create /mnt/@home > "${void}" 2> "${log}" || err_abort + btrfs subvolume create /mnt/@cache > "${void}" 2> "${log}" || err_abort + btrfs subvolume create /mnt/@log > "${void}" 2> "${log}" || err_abort + btrfs subvolume create /mnt/@tmp > "${void}" 2> "${log}" || err_abort + btrfs subvolume create /mnt/@snapshots > "${void}" 2> "${log}" || err_abort if [[ "${swapmode}" == "2" ]]; then - btrfs subvolume create /mnt/@swap > ${void} 2> ${log} || err_abort + btrfs subvolume create /mnt/@swap > "${void}" 2> "${log}" || err_abort fi - umount /mnt > ${void} 2> ${log} || err_abort + umount /mnt > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " @@ -5308,7 +5334,7 @@ Enter a name ${bwhite}(empty to skip and proceed)${blue}: " if [[ -n "${rootpartname}" ]]; then if [[ "${fs}" == "1" ]]; then - if e2label "${rootpart}" "${rootpartname}" > ${void} 2> ${log} ; then + if e2label "${rootpart}" "${rootpartname}" > "${void}" 2> "${log}" ; then sleep 0.2 NC " @@ -5320,7 +5346,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}" > ${void} 2> ${log} || err_abort + btrfs filesystem label /mnt "${rootpartname}" > "${void}" 2> "${log}" || err_abort umount /mnt || err_abort sleep 0.2 NC " @@ -5366,9 +5392,9 @@ ask_homepart_form() { fi if [[ "${homeform}" == "y" ]]; then - if mkfs.ext4 -F -L Home "${home_dev}" > ${void} 2> ${log} ; then - tune2fs -O fast_commit "${home_dev}" > ${void} 2> ${log} || err_abort - mount --mkdir "${home_dev}" /mnt/home > ${void} 2> ${log} || err_abort + if mkfs.ext4 -F -L Home "${home_dev}" > "${void}" 2> "${log}" ; then + tune2fs -O fast_commit "${home_dev}" > "${void}" 2> "${log}" || err_abort + mount --mkdir "${home_dev}" /mnt/home > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " ==> [${green}/Home OK${nc}] @@ -5421,8 +5447,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}" > ${void} 2> ${log} ; then - tune2fs -O fast_commit "${homepart}" > ${void} 2> ${log} || err_abort + if mkfs.ext4 -F "${homepart}" > "${void}" 2> "${log}" ; then + tune2fs -O fast_commit "${homepart}" > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " @@ -5449,7 +5475,7 @@ Enter a name ${bwhite}(empty to skip and proceed)${blue}: " ==> " homepartname if [[ -n "${homepartname}" ]]; then - if e2label "${homepart}" "${homepartname}" > ${void} 2> ${log} ;then + if e2label "${homepart}" "${homepartname}" > "${void}" 2> "${log}" ;then sleep 0.2 NC " @@ -5502,7 +5528,7 @@ Enter your${nc} ${cyan}${roottype} ${blue}partition number: " if [[ -e "${rootpart}" ]]; then #-------------------------------------------------------------------------------------------------- if [[ "${fs}" == "1" ]]; then - if mount "${rootpart}" /mnt > ${void} 2> ${log} ; then + if mount "${rootpart}" /mnt > "${void}" 2> "${log}" ; then sleep 0.2 ok return 0 @@ -5512,15 +5538,15 @@ Enter your${nc} ${cyan}${roottype} ${blue}partition number: " fi #-------------------------------------------------------------------------------------------------- elif [[ "${fs}" == "2" ]]; then - if mount -o "${sbvl_mnt_opts}",subvol=@ "${rootpart}" /mnt > ${void} 2> ${log} ; then + if mount -o "${sbvl_mnt_opts}",subvol=@ "${rootpart}" /mnt > "${void}" 2> "${log}" ; then if [[ "${swapmode}" == "2" ]]; then - mount --mkdir -o rw,nodatacow,subvol=@swap "${rootpart}" /mnt/swap > ${void} 2> ${log} || err_abort + mount --mkdir -o rw,nodatacow,subvol=@swap "${rootpart}" /mnt/swap > "${void}" 2> "${log}" || err_abort fi - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache "${rootpart}" /mnt/var/cache > ${void} 2> ${log} || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home "${rootpart}" /mnt/home > ${void} 2> ${log} || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log "${rootpart}" /mnt/var/log > ${void} 2> ${log} || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@snapshots "${rootpart}" /mnt/"${snapname}" > ${void} 2> ${log} || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@tmp "${rootpart}" /mnt/var/tmp > ${void} 2> ${log} || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache "${rootpart}" /mnt/var/cache > "${void}" 2> "${log}" || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home "${rootpart}" /mnt/home > "${void}" 2> "${log}" || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log "${rootpart}" /mnt/var/log > "${void}" 2> "${log}" || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@snapshots "${rootpart}" /mnt/"${snapname}" > "${void}" 2> "${log}" || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@tmp "${rootpart}" /mnt/var/tmp > "${void}" 2> "${log}" || err_abort sleep 0.2 ok return 0 @@ -5567,7 +5593,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}" > ${void} 2> ${log} ; then + if mount --mkdir "${esppart}" "${esp_mount}" > "${void}" 2> "${log}" ; then ok return 0 else @@ -5612,7 +5638,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 > ${void} 2> ${log} ; then + if mount --mkdir "${xbootpart}" /mnt/boot > "${void}" 2> "${log}" ; then ok return 0 else @@ -5658,7 +5684,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 > ${void} 2> ${log} ; then + if mount --mkdir "${homepart}" /mnt/home > "${void}" 2> "${log}" ; then ok return 0 else @@ -5723,8 +5749,7 @@ ${magenta}###${nc}-------------------------------${magenta}[ ${bwhite}Confirm In ################################################################################################### revise() { - revision="yes" - reset=(xbootloader="" gfxconf="" vendor_slct="" vendor="" desktop="" terminal="" custompkgs="" customservices="" cust_bootopts="" REGDOM="" autoroot="" autoxboot="" autohome="" autoswap="" vendors="" lowlat="" nogsp="" sanity="" smartpart="" partok="" preset="" presetpart="" set_optm="" ask_param="" kill_watchdog="" genoptm="" desk_setup="" devel="" web="" web_browser="" web_slct="" set_optm_slct="" oomd="" irqbalance="" thermald="" rngd="" rtkit="" tlp="") + reset=(xbootloader="" gfxconf="" vendor_slct="" vendor="" desktop="" terminal="" custompkgs="" customservices="" cust_bootopts="" REGDOM="" autoroot="" autoxboot="" autohome="" autoswap="" vendors="" lowlat="" nogsp="" sanity="" smartpart="" partok="" preset="" presetpart="" set_optm="" ask_param="" kill_watchdog="" genoptm="" desk_setup="" devel="" web="" web_pkg="" web_foreign="" web_slct="" set_optm_slct="" oomd="" irqbalance="" thermald="" rngd="" rtkit="" tlp="" E_ROOT="") export "${reset[@]}" gfxpkgs=() @@ -5863,9 +5888,9 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS fi #------------------------------------------------------------------------------------------ if [[ "${fs}" == "1" ]]; then - mkfs.ext4 -F -L Root /dev/mapper/"${ENCROOT}" > ${void} 2> ${log} || err_abort - tune2fs -O fast_commit /dev/mapper/"${ENCROOT}" > ${void} 2> ${log} || err_abort - mount /dev/mapper/"${ENCROOT}" /mnt > ${void} 2> ${log} || err_abort + mkfs.ext4 -F -L Root /dev/mapper/"${ENCROOT}" > "${void}" 2> "${log}" || err_abort + tune2fs -O fast_commit /dev/mapper/"${ENCROOT}" > "${void}" 2> "${log}" || err_abort + mount /dev/mapper/"${ENCROOT}" /mnt > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " ==> [${green}Encrypted /Root OK${nc}] @@ -5873,27 +5898,27 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS luks_root="ok" #------------------------------------------------------------------------------------------ elif [[ "${fs}" == "2" ]]; then - mkfs.btrfs -f -L Root /dev/mapper/"${ENCROOT}" > ${void} 2> ${log} || err_abort - mount /dev/mapper/"${ENCROOT}" /mnt > ${void} 2> ${log} || err_abort - btrfs subvolume create /mnt/@ > ${void} 2> ${log} || err_abort - btrfs subvolume create /mnt/@home > ${void} 2> ${log} || err_abort - btrfs subvolume create /mnt/@cache > ${void} 2> ${log} || err_abort - btrfs subvolume create /mnt/@log > ${void} 2> ${log} || err_abort - btrfs subvolume create /mnt/@snapshots > ${void} 2> ${log} || err_abort - btrfs subvolume create /mnt/@tmp > ${void} 2> ${log} || err_abort + mkfs.btrfs -f -L Root /dev/mapper/"${ENCROOT}" > "${void}" 2> "${log}" || err_abort + mount /dev/mapper/"${ENCROOT}" /mnt > "${void}" 2> "${log}" || err_abort + btrfs subvolume create /mnt/@ > "${void}" 2> "${log}" || err_abort + btrfs subvolume create /mnt/@home > "${void}" 2> "${log}" || err_abort + btrfs subvolume create /mnt/@cache > "${void}" 2> "${log}" || err_abort + btrfs subvolume create /mnt/@log > "${void}" 2> "${log}" || err_abort + btrfs subvolume create /mnt/@snapshots > "${void}" 2> "${log}" || err_abort + btrfs subvolume create /mnt/@tmp > "${void}" 2> "${log}" || err_abort if [[ "${swapmode}" == "2" ]]; then - btrfs subvolume create /mnt/@swap > ${void} 2> ${log} || err_abort + btrfs subvolume create /mnt/@swap > "${void}" 2> "${log}" || err_abort fi - umount /mnt > ${void} 2> ${log} || err_abort - mount -o "${sbvl_mnt_opts}",subvol=@ /dev/mapper/"${ENCROOT}" /mnt > ${void} 2> ${log} || err_abort + umount /mnt > "${void}" 2> "${log}" || err_abort + mount -o "${sbvl_mnt_opts}",subvol=@ /dev/mapper/"${ENCROOT}" /mnt > "${void}" 2> "${log}" || err_abort if [[ "${swapmode}" == "2" ]]; then - mount --mkdir -o rw,nodatacow,subvol=@swap /dev/mapper/"${ENCROOT}" /mnt/swap > ${void} 2> ${log} || err_abort + mount --mkdir -o rw,nodatacow,subvol=@swap /dev/mapper/"${ENCROOT}" /mnt/swap > "${void}" 2> "${log}" || err_abort fi - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache /dev/mapper/"${ENCROOT}" /mnt/var/cache > ${void} 2> ${log} || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home /dev/mapper/"${ENCROOT}" /mnt/home > ${void} 2> ${log} || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log /dev/mapper/"${ENCROOT}" /mnt/var/log > ${void} 2> ${log} || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@snapshots /dev/mapper/"${ENCROOT}" /mnt/"${snapname}" > ${void} 2> ${log} || err_abort - mount --mkdir -o "${sbvl_mnt_opts}",subvol=@tmp /dev/mapper/"${ENCROOT}" /mnt/var/tmp > ${void} 2> ${log} || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache /dev/mapper/"${ENCROOT}" /mnt/var/cache > "${void}" 2> "${log}" || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home /dev/mapper/"${ENCROOT}" /mnt/home > "${void}" 2> "${log}" || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log /dev/mapper/"${ENCROOT}" /mnt/var/log > "${void}" 2> "${log}" || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@snapshots /dev/mapper/"${ENCROOT}" /mnt/"${snapname}" > "${void}" 2> "${log}" || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@tmp /dev/mapper/"${ENCROOT}" /mnt/var/tmp > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " ==> [${green}Encrypted /@ OK${nc}] @@ -5915,7 +5940,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS else cryptsetup luksOpen "${swap_dev}" swap || err_abort fi - mkswap /dev/mapper/swap > ${void} 2> ${log} || err_abort + mkswap /dev/mapper/swap > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " ==> [${green}Encrypted /Swap OK${nc}] @@ -5937,9 +5962,9 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS else cryptsetup luksOpen "${home_dev}" "${ENCRHOME}" || err_abort fi - mkfs.ext4 -F -L Home /dev/mapper/"${ENCRHOME}" > ${void} 2> ${log} || err_abort - tune2fs -O fast_commit /dev/mapper/"${ENCRHOME}" > ${void} 2> ${log} || err_abort - mount --mkdir /dev/mapper/"${ENCRHOME}" /mnt/home > ${void} 2> ${log} || err_abort + mkfs.ext4 -F -L Home /dev/mapper/"${ENCRHOME}" > "${void}" 2> "${log}" || err_abort + tune2fs -O fast_commit /dev/mapper/"${ENCRHOME}" > "${void}" 2> "${log}" || err_abort + mount --mkdir /dev/mapper/"${ENCRHOME}" /mnt/home > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " ==> [${green}Encrypted /Home OK${nc}] @@ -5965,9 +5990,9 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS homeform="${homeform,,}" if [[ "${homeform}" == "y" ]]; then - if mkfs.ext4 -F -L Home "${home_dev}" > ${void} 2> ${log} ; then - tune2fs -O fast_commit "${home_dev}" > ${void} 2> ${log} || err_abort - mount --mkdir "${home_dev}" /mnt/home > ${void} 2> ${log} || err_abort + if mkfs.ext4 -F -L Home "${home_dev}" > "${void}" 2> "${log}" ; then + tune2fs -O fast_commit "${home_dev}" > "${void}" 2> "${log}" || err_abort + mount --mkdir "${home_dev}" /mnt/home > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " ==> [${green}/Home OK${nc}] @@ -5987,8 +6012,8 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS fi #-------------------------------------------------------------------------------------------------- if [[ "${multibooting}" == "n" ]]; then - if mkfs.fat -F 32 -n ESP "${esp_dev}" > ${void} 2> ${log} ; then - mount --mkdir "${esp_dev}" "${esp_mount}" > ${void} 2> ${log} || err_abort + if mkfs.fat -F 32 -n ESP "${esp_dev}" > "${void}" 2> "${log}" ; then + mount --mkdir "${esp_dev}" "${esp_mount}" > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " ==> [${green}/ESP OK${nc}] @@ -5998,7 +6023,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS until luks; do : ; done fi elif [[ "${multibooting}" == "y" && "${espfs}" == "vfat" ]]; then - if mount --mkdir "${esp_dev}" "${esp_mount}" > ${void} 2> ${log} ; then + if mount --mkdir "${esp_dev}" "${esp_mount}" > "${void}" 2> "${log}" ; then sleep 0.2 NC " ==> [${green}Unformatted /ESP OK${nc}] @@ -6010,8 +6035,8 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS return 1 fi elif [[ "${multibooting}" == "y" && "${espfs}" != "vfat" ]]; then - if mkfs.fat -F 32 -n ESP "${esp_dev}" > ${void} 2> ${log} ; then - mount --mkdir "${esp_dev}" "${esp_mount}" > ${void} 2> ${log} || err_abort + if mkfs.fat -F 32 -n ESP "${esp_dev}" > "${void}" 2> "${log}" ; then + mount --mkdir "${esp_dev}" "${esp_mount}" > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " ==> [${green}/ESP OK${nc}] @@ -6023,8 +6048,8 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS fi #-------------------------------------------------------------------------------------------------- if [[ "${xbootloader}" == "yes" ]] ; then - if mkfs.fat -F 32 -n XBOOTLDR "${xboot_dev}" > ${void} 2> ${log} ; then - mount --mkdir "${xboot_dev}" /mnt/boot > ${void} 2> ${log} || err_abort + if mkfs.fat -F 32 -n XBOOTLDR "${xboot_dev}" > "${void}" 2> "${log}" ; then + mount --mkdir "${xboot_dev}" /mnt/boot > "${void}" 2> "${log}" || err_abort sleep 0.2 NC " ==> [${green}/XBOOTLDR OK${nc}] @@ -6141,7 +6166,7 @@ pacstrap_system() { ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacstrap System${nc} ${magenta}]${nc}-------------------------------------${magenta}### " - cnfg + installing gfxpkgs_set if [[ "${bootloader}" == "2" ]]; then @@ -6167,7 +6192,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs basepkgs+=(alsa-firmware linux-firmware sof-firmware) fi if [[ ! "${desktop}" =~ ^(11|12)$ ]]; then - basepkgs+=(7zip alsa-utils exfatprogs git glibc-locales gst-libav gst-plugin-libcamera gst-plugin-pipewire gst-plugins-bad gst-plugins-good gst-plugins-ugly libfido2 man-db man-pages mesa-utils nano-syntax-highlighting pacman-contrib pipewire-libcamera pipewire-pulse pipewire-zeroconf reflector xdg-user-dirs) + basepkgs+=(7zip alsa-utils bluez bluez-utils bluez-mesh bluez-obex exfatprogs git glibc-locales gst-libav gst-plugin-libcamera gst-plugin-pipewire gst-plugins-bad gst-plugins-good gst-plugins-ugly libfido2 man-db man-pages mesa-utils nano-syntax-highlighting pacman-contrib pipewire-libcamera pipewire-pulse pipewire-zeroconf reflector xdg-user-dirs) fi if [[ "${terminal}" == "y" ]]; then basepkgs+=(gnome-terminal) @@ -6193,8 +6218,8 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs if [[ -n "${print_pkgs}" ]]; then basepkgs+=("${print_pkgs}") fi - if [[ -n "${web_browser}" ]]; then - basepkgs+=("${web_browser}") + if [[ -n "${web_pkg}" ]]; then + basepkgs+=("${web_pkg}") fi case "${desktop}" in @@ -6204,7 +6229,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs displaymanager="sddm" ;; 2) # Plasma Light Desktop: - deskpkgs="${basepkgs[*]} ark bluedevil breeze-gtk colord-kde dolphin-plugins flatpak-kcm freerdp kate kcalc kclock kde-gtk-config kdegraphics-mobipocket kdegraphics-thumbnailers kdenetwork-filesharing kdeplasma-addons kdf kdialog keditbookmarks kget kimageformats kio-admin kio-gdrive kio-zeroconf konsole krdc krfb kscreen kwayland-integration kwrited okular purpose ocean-sound-theme packagekit-qt6 partitionmanager plasma5-integration plasma-browser-integration plasma-desktop plasma-disks plasma-firewall plasma-nm plasma-pa plasma-systemmonitor plasma-wayland-protocols plasma-x11-session sddm-kcm spectacle appmenu-gtk-module arj bluez-obex dosfstools ffmpegthumbs icoutils kvantum libappimage lrzip lzop maliit-keyboard ntfs-3g power-profiles-daemon qt5-xmlpatterns qt6-connectivity qt6-multimedia-gstreamer unarchiver unrar xdg-desktop-portal-gtk" + deskpkgs="${basepkgs[*]} ark bluedevil breeze-gtk colord-kde dolphin-plugins flatpak-kcm freerdp kate kcalc kclock kde-gtk-config kdegraphics-mobipocket kdegraphics-thumbnailers kdenetwork-filesharing kdeplasma-addons kdf kdialog keditbookmarks kget kimageformats kio-admin kio-gdrive kio-zeroconf konsole krdc krfb kscreen kwayland-integration kwrited okular purpose ocean-sound-theme packagekit-qt6 partitionmanager plasma5-integration plasma-browser-integration plasma-desktop plasma-disks plasma-firewall plasma-nm plasma-pa plasma-systemmonitor plasma-wayland-protocols plasma-x11-session sddm-kcm spectacle appmenu-gtk-module arj dosfstools ffmpegthumbs icoutils kvantum libappimage lrzip lzop maliit-keyboard ntfs-3g power-profiles-daemon qt5-xmlpatterns qt6-connectivity qt6-multimedia-gstreamer unarchiver unrar xdg-desktop-portal-gtk" displaymanager="sddm" ;; 3) # Gnome Desktop: @@ -6224,7 +6249,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs displaymanager="lightdm" ;; 7) # Deepin Desktop: - deskpkgs="${basepkgs[*]} adobe-source-han-sans-otc-fonts bluez deepin deepin-album deepin-calculator deepin-camera deepin-clipboard deepin-community-wallpapers deepin-compressor deepin-device-formatter deepin-editor deepin-font-manager deepin-grand-search deepin-kwin deepin-movie deepin-printer deepin-reader deepin-screensaver deepin-shortcut-viewer deepin-terminal gtk-engine-murrine iw proxychains-ng qt6-multimedia-gstreamer redshift zssh" + deskpkgs="${basepkgs[*]} adobe-source-han-sans-otc-fonts deepin deepin-album deepin-calculator deepin-camera deepin-clipboard deepin-community-wallpapers deepin-compressor deepin-device-formatter deepin-editor deepin-font-manager deepin-grand-search deepin-kwin deepin-movie deepin-printer deepin-reader deepin-screensaver deepin-shortcut-viewer deepin-terminal gtk-engine-murrine iw proxychains-ng qt6-multimedia-gstreamer redshift zssh" displaymanager="lightdm" ;; 8) # Budgie Desktop: @@ -6271,9 +6296,6 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs if [[ -n "${print_pkgs}" ]]; then custarray+=("${print_pkgs}") fi - if [[ -n "${web_browser}" ]]; then - custarray+=("${web_browser}") - fi deskpkgs="${custarray[*]}" ;; 13) # Cosmic Desktop: @@ -6292,7 +6314,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs " read -r -s -n 1 - if pacstrap -K /mnt ${deskpkgs} 2> ${log} ; then + if pacstrap -K /mnt ${deskpkgs} 2> "${log}" ; then if [[ "${fs}" == "2" ]]; then genfstab -t PARTUUID /mnt >> /mnt/etc/fstab || err_abort sleep 0.2 @@ -6320,7 +6342,7 @@ swapfile() { ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Swapfile Setup${nc} ${magenta}]${nc}-------------------------------------${magenta}### " - if arch-chroot /mnt <<-SWAPFILE > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-SWAPFILE > "${void}" 2>&1 2> "${log}" ; then mkswap -U clear --size ${swapsize}G --file /swapfile || exit SWAPFILE cat >> /mnt/etc/fstab <<-FSTAB || err_abort @@ -6341,7 +6363,7 @@ swapfile_btrfs() { ${magenta}###${nc}----------------------------------${magenta}[ ${bwhite}Btrfs Swapfile Setup${nc} ${magenta}]${nc}----------------------------------${magenta}### " - if arch-chroot /mnt <<-SWAPFILE > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-SWAPFILE > "${void}" 2>&1 2> "${log}" ; then btrfs filesystem mkswapfile --size ${swapsize}g --uuid clear /swap/swapfile || exit SWAPFILE cat >> /mnt/etc/fstab <<-FSTAB || err_abort @@ -6372,7 +6394,7 @@ ${magenta}###${nc}--------------------------${magenta}[ ${bwhite}Setting Up Wire main_chroot() { local stage_prompt="Base System Configuration" - if arch-chroot /mnt <<-CONF > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-CONF > "${void}" 2>&1 2> "${log}" ; then sed -i "/^#${SETLOCALE}/s/^#//" /etc/locale.gen || exit locale-gen || exit echo LANG=${SETLOCALE} > /etc/locale.conf || exit @@ -6409,7 +6431,7 @@ btldrcfg() { if [[ "${bootloader}" == "1" ]]; then local stage_prompt="Systemd-boot Configuration" if [[ "${xbootloader}" == "no" ]]; then - if arch-chroot /mnt <<-BOOTCTL > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-BOOTCTL > "${void}" 2>&1 2> "${log}" ; then bootctl install || exit sed -i "/^#timeout 3/s/^#//" ${btldr_esp_mount}/loader/loader.conf || exit systemctl enable systemd-boot-update || exit @@ -6419,7 +6441,7 @@ BOOTCTL stage_fail fi elif [[ "${xbootloader}" == "yes" ]]; then - if arch-chroot /mnt <<-XBOOTCTL > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-XBOOTCTL > "${void}" 2>&1 2> "${log}" ; then bootctl --esp-path=/efi --boot-path=/boot install || exit sed -i "/^#timeout 3/s/^#//" ${btldr_esp_mount}/loader/loader.conf || exit systemctl enable systemd-boot-update || exit @@ -6431,7 +6453,7 @@ XBOOTCTL fi elif [[ "${bootloader}" == "2" ]]; then local stage_prompt="Grub Configuration" - if arch-chroot /mnt <<-GRUB > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-GRUB > "${void}" 2>&1 2> "${log}" ; then cp /etc/default/grub /etc/default/grub.bak || exit cat <<-CFG > /etc/default/grub || exit GRUB_DEFAULT=0 @@ -6456,7 +6478,7 @@ GRUB local stage_prompt="Grub Installation" if [[ "${sb_sign}" == "y" ]]; then - if arch-chroot /mnt <<-SBGRUBINST > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-SBGRUBINST > "${void}" 2>&1 2> "${log}" ; 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 @@ -6466,7 +6488,7 @@ SBGRUBINST stage_fail fi elif [[ "${sb_sign}" == "n" ]]; then - if arch-chroot /mnt <<-GRUBINST > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-GRUBINST > "${void}" 2>&1 2> "${log}" ; then grub-install --target=${uefimode} --efi-directory=${btldr_esp_mount} --bootloader-id=GRUB --recheck || exit grub-mkconfig -o /boot/grub/grub.cfg || exit GRUBINST @@ -6478,7 +6500,7 @@ GRUBINST if [[ "${fs}" == "2" ]]; then local stage_prompt="Grub-Btrfsd Service Activation" - if arch-chroot /mnt <<-GRUB_BTRFSD > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-GRUB_BTRFSD > "${void}" 2>&1 2> "${log}" ; then systemctl enable grub-btrfsd || exit GRUB_BTRFSD stage_ok @@ -6489,7 +6511,7 @@ GRUB_BTRFSD if [[ "${gfxconf}" == "y" && "${vendor}" == "Nvidia" ]]; then local stage_prompt="Grub/Nvidia Configuration" - if arch-chroot /mnt <<-NVGRUB > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-NVGRUB > "${void}" 2>&1 2> "${log}" ; then sed -i "/^#GRUB_TERMINAL_OUTPUT=console/s/^#//" /etc/default/grub || exit grub-mkconfig -o /boot/grub/grub.cfg || exit NVGRUB @@ -6505,7 +6527,7 @@ trimcfg() { if [[ -n "${trim}" ]]; then local stage_prompt="Trim Service Activation" - if arch-chroot /mnt <<-TRIM > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-TRIM > "${void}" 2>&1 2> "${log}" ; then systemctl enable ${trim} || exit TRIM stage_ok @@ -6519,7 +6541,7 @@ vm_serv() { if [[ -n "${vm_services}" ]]; then local stage_prompt="VM Service(s) Activation" - if arch-chroot /mnt <<-VM > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-VM > "${void}" 2>&1 2> "${log}" ; then systemctl enable ${vm_services} || exit VM stage_ok @@ -6534,7 +6556,7 @@ zramcfg() { if [[ -n "${zram}" ]]; then local stage_prompt="Zram Swap Activation" zram_service="systemd-zram-setup@zram0.service" - if arch-chroot /mnt <<-ZRAMCONF > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-ZRAMCONF > "${void}" 2>&1 2> "${log}" ; then mkdir -p /etc/systemd/zram-generator.conf.d || exit cat <<-ZCONF > /etc/systemd/zram-generator.conf.d/zram.conf || exit [zram0] @@ -6562,7 +6584,7 @@ nvidia_hook() { if [[ "${gfxconf}" == "y" && "${vendor}" == "Nvidia" ]] || [[ "${gfxconf}" == "y" && "${vendors}" =~ "Nvidia" ]]; then if [[ "${nvname}" =~ ^(nvidia-open|nvidia|nvidia-lts)$ ]]; then local stage_prompt="Nvidia Hook Creation" - if arch-chroot /mnt <<-NVIDIAHOOK > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-NVIDIAHOOK > "${void}" 2>&1 2> "${log}" ; then mkdir -p /etc/pacman.d/hooks/ || exit cat <<-HOOK > /etc/pacman.d/hooks/nvidia.hook || exit [Trigger] @@ -6597,7 +6619,7 @@ mkinitcpio_preset() { if [[ ! -e "${esp_mount}"/EFI/Linux ]]; then mkdir -p "${esp_mount}"/EFI/Linux || exit fi - if arch-chroot /mnt <<-UKI > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-UKI > "${void}" 2>&1 2> "${log}" ; 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 @@ -6622,7 +6644,7 @@ UKI fi elif [[ "${uki}" == "n" ]]; then - if arch-chroot /mnt <<-NOUKI > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-NOUKI > "${void}" 2>&1 2> "${log}" ; then cp /etc/mkinitcpio.d/${kernel}.preset /etc/mkinitcpio.d/${kernel}.preset.bak || exit cat <<-MKINITPRESET > /etc/mkinitcpio.d/${kernel}.preset || exit ALL_config="/etc/mkinitcpio.conf.d/mkinitcpiod.conf" @@ -6644,7 +6666,7 @@ var_opts() { if [[ ${sb_sign} == "y" && "${setrescue}" == "y" ]]; then local stage_prompt="Rescue Entry Creation" if [[ "${bootloader}" == "1" ]]; then - if arch-chroot /mnt <<-RESCUE > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-RESCUE > "${void}" 2>&1 2> "${log}" ; then echo "systemd.unit=rescue.target rw ${boot_opts[*]}" | tee /etc/cmdline.d/rescue.conf || exit cat <<-PRESET > /etc/mkinitcpio.d/${kernel}.preset || exit ALL_config="/etc/mkinitcpio.conf.d/mkinitcpiod.conf" @@ -6662,7 +6684,7 @@ RESCUE stage_fail fi elif [[ "${bootloader}" == "2" ]]; then - if arch-chroot /mnt <<-RESCUE > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-RESCUE > "${void}" 2>&1 2> "${log}" ; then touch /boot/grub/custom.cfg grep -E -A 11 "'Arch Linux'" /boot/grub/grub.cfg > /boot/grub/custom.cfg || exit sed -i 's/Arch Linux/Rescue Environment/' /boot/grub/custom.cfg || exit @@ -6677,7 +6699,7 @@ RESCUE if [[ "${multilib}" == "y" ]]; then local stage_prompt="Multilib Configuration" - if arch-chroot /mnt <<-MULTILIB > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-MULTILIB > "${void}" 2>&1 2> "${log}" ; then sed -i "/\[multilib\]/,/Include/"'s/^#//' /etc/pacman.conf || exit pacman -Syy || exit MULTILIB @@ -6689,7 +6711,7 @@ MULTILIB if [[ "${CPU}" == *"GenuineIntel"* && "${kill_watchdog}" == "y" ]]; then local stage_prompt="Intel Watchdog Configuration" - if arch-chroot /mnt <<-INTEL_WATCHDOG > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-INTEL_WATCHDOG > "${void}" 2>&1 2> "${log}" ; then echo "blacklist iTCO_wdt" | tee /etc/modprobe.d/blacklist.conf || exit INTEL_WATCHDOG stage_ok @@ -6698,7 +6720,7 @@ INTEL_WATCHDOG fi elif [[ "${CPU}" == *"AuthenticAMD"* && "${kill_watchdog}" == "y" ]]; then local stage_prompt="AMD Watchdog Configuration" - if arch-chroot /mnt <<-AMD_WATCHDOG > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-AMD_WATCHDOG > "${void}" 2>&1 2> "${log}" ; then echo "blacklist sp5100_tco" | tee /etc/modprobe.d/blacklist.conf || exit AMD_WATCHDOG stage_ok @@ -6709,8 +6731,8 @@ AMD_WATCHDOG if [[ "${oomd}" == "y" ]]; then local stage_prompt="Systemd-oomd Service Activation" - if arch-chroot /mnt <<-OOMD > ${void} 2>&1 2> ${log} ; then - mkdir -p /etc/systemd/system.conf.d > ${void} 2>&1 || exit + if arch-chroot /mnt <<-OOMD > "${void}" 2>&1 2> "${log}" ; then + mkdir -p /etc/systemd/system.conf.d > "${void}" 2>&1 || exit cat <<-OOMD_CONF > /etc/systemd/system.conf.d/00-oomd.conf || exit [Manager] DefaultMemoryAccounting=yes @@ -6725,7 +6747,7 @@ OOMD if [[ "${irqbalance}" == "y" ]]; then local stage_prompt="Irqbalance Service Activation" - if arch-chroot /mnt <<-IRQBALANCE > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-IRQBALANCE > "${void}" 2>&1 2> "${log}" ; then pacman -S --noconfirm irqbalance || exit systemctl enable irqbalance || exit IRQBALANCE @@ -6737,7 +6759,7 @@ IRQBALANCE if [[ "${thermald}" == "y" ]]; then local stage_prompt="Thermald Service Activation" - if arch-chroot /mnt <<-THERMALD > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-THERMALD > "${void}" 2>&1 2> "${log}" ; then pacman -S --noconfirm thermald || exit systemctl enable thermald || exit THERMALD @@ -6749,7 +6771,7 @@ THERMALD if [[ "${rngd}" == "y" ]]; then local stage_prompt="Rngd Service Activation" - if arch-chroot /mnt <<-RNGD > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-RNGD > "${void}" 2>&1 2> "${log}" ; then pacman -S --noconfirm rng-tools || exit systemctl enable rngd || exit RNGD @@ -6761,7 +6783,7 @@ RNGD if [[ "${rtkit}" == "y" ]]; then local stage_prompt="Rtkit Service Activation" - if arch-chroot /mnt <<-RTKIT > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-RTKIT > "${void}" 2>&1 2> "${log}" ; then pacman -S --noconfirm realtime-privileges rtkit || exit systemctl enable rtkit-daemon || exit usermod -aG realtime ${USERNAME} @@ -6775,7 +6797,7 @@ RTKIT if [[ "${tlp}" == "y" ]]; then local stage_prompt="Power-profiles-daemon Removal" if [[ -e usr/lib/power-profiles-daemon ]]; then - if arch-chroot /mnt <<-PPD > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-PPD > "${void}" 2>&1 2> "${log}" ; then pacman -Rns --noconfirm power-profiles-daemon || exit PPD stage_ok @@ -6785,7 +6807,7 @@ PPD fi local stage_prompt="Tlp Service Activation" - if arch-chroot /mnt <<-TLP > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-TLP > "${void}" 2>&1 2> "${log}" ; then pacman -S --noconfirm tlp || exit systemctl enable tlp systemctl mask systemd-rfkill.service systemd-rfkill.socket || exit @@ -6798,7 +6820,7 @@ TLP if [[ "${printer}" == "y" ]]; then local stage_prompt="Print & Scan Services Activation" - if arch-chroot /mnt <<-PRINT_CONF > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-PRINT_CONF > "${void}" 2>&1 2> "${log}" ; then systemctl enable avahi-daemon.socket cups.socket cups-browsed ipp-usb || exit sed -i 's|^hosts.*|hosts: mymachines mdns_minimal resolve [!UNAVAIL=return] files myhostname dns|g' /etc/nsswitch.conf || exit sed -i 's/ interface = [^ ]*/ interface = all/g' /etc/ipp-usb/ipp-usb.conf || exit @@ -6810,11 +6832,39 @@ PRINT_CONF fi } ################################################################################################### +foreign() { + + if [[ -n "${web_foreign}" ]]; then + local stage_prompt="Base-devel Installation" + if [[ "${dev}" != "y" ]]; then + if arch-chroot /mnt <<-BASE-DEVEL > "${void}" 2>&1 2> "${log}" ; then + pacman -S --noconfirm base-devel || exit +BASE-DEVEL + stage_ok + else + stage_fail + fi + fi + + local stage_prompt="AUR Packages Installation" + if arch-chroot /mnt <<-AUR-PKGS > "${void}" 2>&1 2> "${log}" ; then + pacman -S --noconfirm git || exit + sed -i 's|if (( EUID == 0 )); then|if (( EUID != 0 )); then|g' /usr/bin/makepkg || exit + git clone https://aur.archlinux.org/${web_foreign}.git && cd ${web_foreign} && makepkg -s --noconfirm && pacman -U --noconfirm *x86_64.pkg.tar.zst && cd .. && rm -rf ${web_foreign} || exit + sed -i 's|if (( EUID != 0 )); then|if (( EUID == 0 )); then|g' /usr/bin/makepkg || exit +AUR-PKGS + stage_ok + else + stage_fail + fi + fi +} +################################################################################################### optimizations() { if [[ "${genoptm}" == "y" ]]; then local stage_prompt="General System Optimizations" - if arch-chroot /mnt <<-GENOPTM > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-GENOPTM > "${void}" 2>&1 2> "${log}" ; then pacman -S --noconfirm ccache ntfs-3g pbzip2 pigz || exit sed -i 's/^#Color/Color\nILoveCandy/' /etc/pacman.conf || exit update-pciids || exit @@ -6932,7 +6982,7 @@ GENOPTM if [[ -d /mnt/etc/udisks2 ]]; then local stage_prompt="Udisks2 Mount Options" - if arch-chroot /mnt <<-UDISKS2 > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-UDISKS2 > "${void}" 2>&1 2> "${log}" ; then cat <<-UDISKS_CONF > /etc/udisks2/mount_options.conf || exit [defaults] ntfs_drivers=ntfs3,ntfs @@ -6949,7 +6999,7 @@ UDISKS2 if [[ -n ${REGDOM} ]]; then local stage_prompt="Wpa_Supplicant Configuration" - if arch-chroot /mnt <<-WPA > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-WPA > "${void}" 2>&1 2> "${log}" ; then cat <<-SUPPLICANT > /etc/wpa_supplicant/wpa_supplicant.conf || exit country=${REGDOM} wps_cred_add_sae=1 @@ -6976,7 +7026,7 @@ secboot_sign() { if [[ ${sb_sign} == "y" ]]; then local stage_prompt="Secure-Boot Signing" if [[ ${bootloader} == "1" ]]; then - if arch-chroot /mnt <<-SECSIGN > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-SECSIGN > "${void}" 2>&1 2> "${log}" ; then systemctl disable systemd-boot-update || exit pacman -S --noconfirm sbctl || exit sbctl create-keys || exit @@ -6993,7 +7043,7 @@ SECSIGN fi if [[ ${setrescue} == "y" ]]; then local stage_prompt="Rescue Entry Secure-Boot Signing" - if arch-chroot /mnt <<-SECSIGN > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-SECSIGN > "${void}" 2>&1 2> "${log}" ; then sbctl sign -s ${btldr_esp_mount}/EFI/Linux/rescue.efi || exit SECSIGN stage_ok @@ -7002,7 +7052,7 @@ SECSIGN fi fi elif [[ ${bootloader} == "2" ]]; then - if arch-chroot /mnt <<-SECSIGN > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-SECSIGN > "${void}" 2>&1 2> "${log}" ; then pacman -S --noconfirm sbctl || exit sbctl create-keys || exit sbctl enroll-keys -m || exit @@ -7169,7 +7219,7 @@ ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Chroot & if [[ -f /mnt/etc/lightdm/lightdm.conf ]]; then if [[ "${desktop}" == "7" ]]; then local stage_prompt="Deepin Greeter Configuration" - if arch-chroot /mnt <<-DEEPIN > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-DEEPIN > "${void}" 2>&1 2> "${log}" ; then sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-deepin-greeter|g' /etc/lightdm/lightdm.conf || exit DEEPIN stage_ok @@ -7178,7 +7228,7 @@ DEEPIN fi elif [[ "${desktop}" =~ ^(5|8|10)$ ]]; then local stage_prompt="GTK Greeter Configuration" - if arch-chroot /mnt <<-GTK > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-GTK > "${void}" 2>&1 2> "${log}" ; then sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-gtk-greeter|g' /etc/lightdm/lightdm.conf || exit GTK stage_ok @@ -7187,7 +7237,7 @@ GTK fi elif [[ "${desktop}" == "6" ]]; then local stage_prompt="Slick Greeter Configuration" - if arch-chroot /mnt <<-SLICK > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-SLICK > "${void}" 2>&1 2> "${log}" ; then sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-slick-greeter|g' /etc/lightdm/lightdm.conf || exit SLICK stage_ok @@ -7198,10 +7248,10 @@ SLICK fi if [[ "${vendor}" != "Virtual Machine" ]]; then - if [[ ! "${desktop}" =~ ^(11|12|13)$ ]]; then - local stage_prompt="Bluetooth Service Activation" - if arch-chroot /mnt <<-BLUETOOTH > ${void} 2>&1 2> ${log} ; then - systemctl enable bluetooth || exit + if [[ ! "${desktop}" =~ ^(11|12)$ ]]; then + local stage_prompt="Bluetooth Services Activation" + if arch-chroot /mnt <<-BLUETOOTH > "${void}" 2>&1 2> "${log}" ; then + systemctl enable bluetooth bluetooth-mesh || exit BLUETOOTH stage_ok else @@ -7212,7 +7262,7 @@ BLUETOOTH if [[ -n "${displaymanager}" ]]; then local stage_prompt="Display Manager Service Activation" - if arch-chroot /mnt <<-DMSERVICE > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-DMSERVICE > "${void}" 2>&1 2> "${log}" ; then systemctl enable ${displaymanager} || exit DMSERVICE stage_ok @@ -7223,7 +7273,7 @@ DMSERVICE if [[ "${desktop}" != "12" ]]; then local stage_prompt="Network Manager Service Activation" - if arch-chroot /mnt <<-NETWORK > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-NETWORK > "${void}" 2>&1 2> "${log}" ; then systemctl enable NetworkManager || exit NETWORK stage_ok @@ -7241,7 +7291,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 > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-GTK > "${void}" 2>&1 2> "${log}" ; then sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-gtk-greeter|g' /etc/lightdm/lightdm.conf || exit GTK stage_ok @@ -7250,7 +7300,7 @@ GTK fi elif [[ "${greeternmbr}" == "2" ]]; then local stage_prompt="Slick Greeter Configuration" - if arch-chroot /mnt <<-SLICK > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-SLICK > "${void}" 2>&1 2> "${log}" ; then sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-slick-greeter|g' /etc/lightdm/lightdm.conf || exit SLICK stage_ok @@ -7259,7 +7309,7 @@ SLICK fi elif [[ "${greeternmbr}" == "3" ]]; then local stage_prompt="Deepin Greeter Configuration" - if arch-chroot /mnt <<-DEEPIN > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-DEEPIN > "${void}" 2>&1 2> "${log}" ; then sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-deepin-greeter|g' /etc/lightdm/lightdm.conf || exit DEEPIN stage_ok @@ -7271,7 +7321,7 @@ DEEPIN if [[ -n "${customservices}" ]]; then local stage_prompt="Custom Service(s) Activation" - if arch-chroot /mnt <<-CUSTOMSERV > ${void} 2>&1 2> ${log} ; then + if arch-chroot /mnt <<-CUSTOMSERV > "${void}" 2>&1 2> "${log}" ; then systemctl enable ${customservices} || exit CUSTOMSERV stage_ok @@ -7287,6 +7337,7 @@ CUSTOMSERV nvidia_hook mkinitcpio_preset var_opts + foreign optimizations secboot_sign completion @@ -7298,23 +7349,22 @@ CUSTOMSERV # END FUNCTIONS ################################################################################################### + clear run_as="$(whoami)" tty="$(tty)" void="/dev/null" log="Amelia_log.txt" disks="$(lsblk --nodeps --paths --noheadings --output=name,size,model | cat --number)" trg="" - vars=(LOCALESET="" SETLOCALE="" lcl_slct="" USERNAME="" kernelnmbr="" fs="" gfxcount="" gfxcard="" intelcount="" intelcards="" nvidiacount="" nvidiacards="" amdcount="" amdcards="" gfxconf="" gfx_conf="" gfx_setup="" vendor="" vendor1="" vendor2="" vendor3="" vendor_slct="" desktop="" terminal="" efi_entr_del="" sanity="" install="" bootldr_pkgs="" devel="" REGDOM="" gfx_bootopts="" btrfs_bootopts="" trim="" swapmode="" homecrypt="" greeter="" revision="" greeternmbr="" cust_bootopts="" vmpkgs="" vm_services="" perf_stream="" displaymanager="" wireless_reg="" bitness="" bootloader="" gfx_slct="" espsize="" autoroot="" autoesp="" autoxboot="" autohome="" autoswap="" rootprt="" espprt="" xbootprt="" homeprt="" swapprt="" partok="" instl_drive="" sgdsk_nmbr="" part_mode="" preset="" capacity="" cap_gib="" rootsize="" sgdrive="" cgdrive="" smartpart="" presetpart="" prcnt="" roottype="" stage_prompt="" zram="" zram_bootopts="" xbootloader="" multibooting="" hypervisor="" mkinitcpio_mods="" uki="" ukify="" cng_espmnt="" sep_home="" encr_swap_bootopts="" uefimode="" luks_encrypt="" nrg_plc="" multilib="" nvname="" nogsp="" luks_root="" luks_swap="" luks_home="" installation="" kill_watchdog="" oomd="" setrescue="" lowlat="" vendors="" dev="" web="" web_browser="" printer="" print_pkgs="" shellnmbr="" shell="" shellname="" shellname2="" shell_pkgs="" genoptm="" set_optm="" ask_param="" desk_setup="" web_slct="" set_optm_slct="" irqbalance="" thermald="" rngd="" rtkit="" tlp="") + vars=(LOCALESET="" SETLOCALE="" lcl_slct="" USERNAME="" kernelnmbr="" fs="" gfxcount="" gfxcard="" intelcount="" intelcards="" nvidiacount="" nvidiacards="" amdcount="" amdcards="" gfxconf="" gfx_conf="" gfx_setup="" vendor="" vendor1="" vendor2="" vendor3="" vendor_slct="" desktop="" terminal="" efi_entr_del="" sanity="" install="" bootldr_pkgs="" devel="" REGDOM="" gfx_bootopts="" btrfs_bootopts="" trim="" swapmode="" homecrypt="" greeter="" greeternmbr="" cust_bootopts="" vmpkgs="" vm_services="" perf_stream="" displaymanager="" wireless_reg="" bitness="" bootloader="" gfx_slct="" espsize="" autoroot="" autoesp="" autoxboot="" autohome="" autoswap="" rootprt="" espprt="" xbootprt="" homeprt="" swapprt="" partok="" instl_drive="" sgdsk_nmbr="" part_mode="" preset="" capacity="" cap_gib="" rootsize="" sgdrive="" cgdrive="" smartpart="" presetpart="" prcnt="" roottype="" stage_prompt="" zram="" zram_bootopts="" xbootloader="" multibooting="" hypervisor="" mkinitcpio_mods="" uki="" ukify="" cng_espmnt="" sep_home="" encr_swap_bootopts="" uefimode="" luks_encrypt="" nrg_plc="" multilib="" nvname="" nogsp="" luks_root="" luks_swap="" luks_home="" installation="" kill_watchdog="" oomd="" setrescue="" lowlat="" vendors="" dev="" web="" web_pkg="" web_foreign="" web_slct="" printer="" print_pkgs="" shellnmbr="" shell="" shellname="" shellname2="" shell_pkgs="" genoptm="" set_optm="" ask_param="" desk_setup="" set_optm_slct="" irqbalance="" thermald="" rngd="" rtkit="" tlp="" E_ROOT="") export "${vars[@]}" - clear - first_check sleep 0.2 - line3 CYANBG "************************************************************************************************* " CYANBG " " CYANBG " ### Amelia Installer ### " CYANBG " " CYANBG "************************************************************************************************* " + mode_check NC " @@ -7326,7 +7376,7 @@ CUSTOMSERV ${bwhite}Press any key to start${nc} " read -r -s -n 1 - clear + set_font arch uefi_check connection_check