From ff7bb93f86e88685b937f0c5f7d65287dd39fd0a Mon Sep 17 00:00:00 2001 From: Elementrick Date: Wed, 26 Jun 2024 19:45:00 +0000 Subject: [PATCH] Change: Replace all 'mkdir' commands with 'mount --mkdir' where applicable --- Amelia.sh | 73 ++++++++++++++++++++++--------------------------------- 1 file changed, 29 insertions(+), 44 deletions(-) diff --git a/Amelia.sh b/Amelia.sh index 79bba70..a3defe3 100644 --- a/Amelia.sh +++ b/Amelia.sh @@ -1,7 +1,7 @@ #!/bin/bash # Amelia Installer -# Version: 6.1 +# Version: 6.2 set -euo pipefail trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR @@ -3418,15 +3418,13 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A umount /mnt > /dev/null 2>&1 || err_abort mount -o "${sbvl_mnt_opts}",subvol=@ "${root_dev}" /mnt > /dev/null 2>&1 || err_abort if [[ "${swapmode}" == "2" ]]; then - mkdir -p /mnt/swap > /dev/null 2>&1 || err_abort - mount -o rw,nodatacow,subvol=@swap "${root_dev}" /mnt/swap > /dev/null 2>&1 || err_abort + mount --mkdir -o rw,nodatacow,subvol=@swap "${root_dev}" /mnt/swap > /dev/null 2>&1 || err_abort fi - mkdir -p /mnt/{var/cache,home,var/log,var/tmp,"${snapname}"} > /dev/null 2>&1 || err_abort - mount -o "${sbvl_mnt_opts}",subvol=@cache "${root_dev}" /mnt/var/cache > /dev/null 2>&1 || err_abort - mount -o "${sbvl_mnt_opts}",subvol=@home "${root_dev}" /mnt/home > /dev/null 2>&1 || err_abort - mount -o "${sbvl_mnt_opts}",subvol=@log "${root_dev}" /mnt/var/log > /dev/null 2>&1 || err_abort - mount -o "${sbvl_mnt_opts}",subvol=@snapshots "${root_dev}" /mnt/"${snapname}" > /dev/null 2>&1 || err_abort - mount -o "${sbvl_mnt_opts}",subvol=@tmp "${root_dev}" /mnt/var/tmp > /dev/null 2>&1 || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache "${root_dev}" /mnt/var/cache > /dev/null 2>&1 || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home "${root_dev}" /mnt/home > /dev/null 2>&1 || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log "${root_dev}" /mnt/var/log > /dev/null 2>&1 || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@snapshots "${root_dev}" /mnt/"${snapname}" > /dev/null 2>&1 || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@tmp "${root_dev}" /mnt/var/tmp > /dev/null 2>&1 || err_abort sleep 0.3 NC " ==> [${green}/@ OK${nc}] @@ -3440,9 +3438,8 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A fi sleep 0.3 #-------------------------------------------------------------------------------------------------- - mkdir -pv /mnt/boot > /dev/null 2>&1 || err_abort if mkfs.fat -F 32 -n Boot "${boot_dev}" > /dev/null 2>&1 ; then - mount "${boot_dev}" /mnt/boot > /dev/null 2>&1 || err_abort + mount --mkdir "${boot_dev}" /mnt/boot > /dev/null 2>&1 || err_abort sleep 0.3 NC " ==> [${green}/Boot OK${nc}] @@ -3467,9 +3464,8 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A ==> " homeform if [[ "${homeform}" == "y" ]]; then - mkdir -pv /mnt/home > /dev/null 2>&1 || err_abort if mkfs.ext4 -F -L Home "${home_dev}" > /dev/null 2>&1 ; then - mount "${home_dev}" /mnt/home > /dev/null 2>&1 || err_abort + mount --mkdir "${home_dev}" /mnt/home > /dev/null 2>&1 || err_abort sleep 0.3 NC " ==> [${green}/Home OK${nc}] @@ -3499,21 +3495,18 @@ manual_mode (){ until form_root; do : ; done until form_home; do : ; done until mount_mnt; do : ; done - mkdir -pv /mnt/{boot,home} > /dev/null 2>&1 || err_abort until mount_boot; do : ; done until mount_home; do : ; done elif [[ "${fs}" == "2" ]]; then until form_efi; do : ; done until form_root; do : ; done until mount_mnt; do : ; done - mkdir -pv /mnt/boot > /dev/null 2>&1 || err_abort until mount_boot; do : ; done fi else until form_efi; do : ; done until form_root; do : ; done until mount_mnt; do : ; done - mkdir -pv /mnt/boot > /dev/null 2>&1 || err_abort until mount_boot; do : ; done fi } @@ -3706,9 +3699,8 @@ ask_homepart_form (){ echo if [[ "${homeform}" == "y" ]]; then - mkdir -pv /mnt/home > /dev/null 2>&1 || err_abort if mkfs.ext4 -F -L Home "${home_dev}" > /dev/null 2>&1 ; then - mount "${home_dev}" /mnt/home > /dev/null 2>&1 || err_abort + mount --mkdir "${home_dev}" /mnt/home > /dev/null 2>&1 || err_abort sleep 0.3 NC " @@ -3849,15 +3841,13 @@ Enter your${nc} ${cyan}${roottype} ${blue}partition number: " elif [[ "${fs}" == "2" ]]; then if mount -o "${sbvl_mnt_opts}",subvol=@ "${rootpart}" /mnt > /dev/null 2>&1 ; then if [[ "${swapmode}" == "2" ]]; then - mkdir -p /mnt/swap > /dev/null 2>&1 || err_abort - mount -o rw,nodatacow,subvol=@swap "${rootpart}" /mnt/swap > /dev/null 2>&1 || err_abort + mount --mkdir -o rw,nodatacow,subvol=@swap "${rootpart}" /mnt/swap > /dev/null 2>&1 || err_abort fi - mkdir -p /mnt/{var/cache,home,var/log,var/tmp,"${snapname}"} > /dev/null 2>&1 || err_abort - mount -o "${sbvl_mnt_opts}",subvol=@cache "${rootpart}" /mnt/var/cache > /dev/null 2>&1 || err_abort - mount -o "${sbvl_mnt_opts}",subvol=@home "${rootpart}" /mnt/home > /dev/null 2>&1 || err_abort - mount -o "${sbvl_mnt_opts}",subvol=@log "${rootpart}" /mnt/var/log > /dev/null 2>&1 || err_abort - mount -o "${sbvl_mnt_opts}",subvol=@snapshots "${rootpart}" /mnt/"${snapname}" > /dev/null 2>&1 || err_abort - mount -o "${sbvl_mnt_opts}",subvol=@tmp "${rootpart}" /mnt/var/tmp > /dev/null 2>&1 || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache "${rootpart}" /mnt/var/cache > /dev/null 2>&1 || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home "${rootpart}" /mnt/home > /dev/null 2>&1 || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log "${rootpart}" /mnt/var/log > /dev/null 2>&1 || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@snapshots "${rootpart}" /mnt/"${snapname}" > /dev/null 2>&1 || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@tmp "${rootpart}" /mnt/var/tmp > /dev/null 2>&1 || err_abort sleep 0.3 ok return 0 @@ -3904,7 +3894,7 @@ Enter your${nc} ${cyan}/Boot ${blue}partition number: " if [[ -n "${mntboot_nmbr}" ]]; then bootpart="$(echo "${volumes}" | awk "\$1 == ${mntboot_nmbr} { print \$2}")" if [[ -e "${bootpart}" ]]; then - if mount "${bootpart}" /mnt/boot > /dev/null 2>&1 ; then + if mount --mkdir "${bootpart}" /mnt/boot > /dev/null 2>&1 ; then ok return 0 else @@ -3949,7 +3939,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 "${homepart}" /mnt/home > /dev/null 2>&1 ; then + if mount --mkdir "${homepart}" /mnt/home > /dev/null 2>&1 ; then ok return 0 else @@ -4145,15 +4135,13 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS umount /mnt > /dev/null 2>&1 || err_abort mount -o "${sbvl_mnt_opts}",subvol=@ /dev/mapper/"${ENCROOT}" /mnt > /dev/null 2>&1 || err_abort if [[ "${swapmode}" == "2" ]]; then - mkdir -p /mnt/swap > /dev/null 2>&1 || err_abort - mount -o rw,nodatacow,subvol=@swap /dev/mapper/"${ENCROOT}" /mnt/swap > /dev/null 2>&1 || err_abort + mount --mkdir -o rw,nodatacow,subvol=@swap /dev/mapper/"${ENCROOT}" /mnt/swap > /dev/null 2>&1 || err_abort fi - mkdir -p /mnt/{var/cache,home,var/log,var/tmp,"${snapname}"} > /dev/null 2>&1 || err_abort - mount -o "${sbvl_mnt_opts}",subvol=@cache /dev/mapper/"${ENCROOT}" /mnt/var/cache > /dev/null 2>&1 || err_abort - mount -o "${sbvl_mnt_opts}",subvol=@home /dev/mapper/"${ENCROOT}" /mnt/home > /dev/null 2>&1 || err_abort - mount -o "${sbvl_mnt_opts}",subvol=@log /dev/mapper/"${ENCROOT}" /mnt/var/log > /dev/null 2>&1 || err_abort - mount -o "${sbvl_mnt_opts}",subvol=@snapshots /dev/mapper/"${ENCROOT}" /mnt/"${snapname}" > /dev/null 2>&1 || err_abort - mount -o "${sbvl_mnt_opts}",subvol=@tmp /dev/mapper/"${ENCROOT}" /mnt/var/tmp > /dev/null 2>&1 || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache /dev/mapper/"${ENCROOT}" /mnt/var/cache > /dev/null 2>&1 || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home /dev/mapper/"${ENCROOT}" /mnt/home > /dev/null 2>&1 || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log /dev/mapper/"${ENCROOT}" /mnt/var/log > /dev/null 2>&1 || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@snapshots /dev/mapper/"${ENCROOT}" /mnt/"${snapname}" > /dev/null 2>&1 || err_abort + mount --mkdir -o "${sbvl_mnt_opts}",subvol=@tmp /dev/mapper/"${ENCROOT}" /mnt/var/tmp > /dev/null 2>&1 || err_abort sleep 0.3 NC " ==> [${green}Encrypted /@ OK${nc}] @@ -4176,7 +4164,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS sleep 0.3 NC " ==> [${green}Encrypted /Swap OK${nc}] - " + " else umount_abort until luks; do : ; done @@ -4192,8 +4180,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS cryptsetup luksOpen "${home_dev}" "${ENCRHOME}" || err_abort fi mkfs.ext4 -F -L Home /dev/mapper/"${ENCRHOME}" > /dev/null 2>&1 || err_abort - mkdir -p /mnt/home > /dev/null 2>&1 || err_abort - mount /dev/mapper/"${ENCRHOME}" /mnt/home > /dev/null 2>&1 || err_abort + mount --mkdir /dev/mapper/"${ENCRHOME}" /mnt/home > /dev/null 2>&1 || err_abort sleep 0.3 NC " ==> [${green}Encrypted /Home OK${nc}] @@ -4214,8 +4201,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS if [[ "${homeform}" == "y" ]]; then if mkfs.ext4 -F -L Home "${home_dev}" > /dev/null 2>&1 ; then - mkdir -p /mnt/home > /dev/null 2>&1 || err_abort - mount "${home_dev}" /mnt/home > /dev/null 2>&1 || err_abort + mount --mkdir "${home_dev}" /mnt/home > /dev/null 2>&1 || err_abort sleep 0.3 NC " ==> [${green}/Home OK${nc}] @@ -4233,8 +4219,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS fi #-------------------------------------------------------------------------------------------------- if mkfs.fat -F 32 -n Boot "${boot_dev}" > /dev/null 2>&1 ; then - mkdir -pv /mnt/boot > /dev/null 2>&1 || err_abort - mount "${boot_dev}" /mnt/boot > /dev/null 2>&1 || err_abort + mount --mkdir "${boot_dev}" /mnt/boot > /dev/null 2>&1 || err_abort sleep 0.3 NC " ==> [${green}/Boot OK${nc}] @@ -4255,7 +4240,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS YELLOW " ###---------------------------------------------[ FILESYSTEM OVERVIEW ]---------------------------------------------### - " + " lsblk -f|GREP_COLORS='mt=01;36' grep -E --color=always 'vfat|$'|GREP_COLORS='mt=01;32' grep -E --color=always 'ext4|$'|GREP_COLORS='mt=01;35' grep -E --color=always 'btrfs|$'|GREP_COLORS='mt=01;31' grep -E --color=always 'ntfs|$'|GREP_COLORS='mt=01;33' grep -E --color=always 'swap|$' YELLOW "