From db9629d5cb8a97720d7f0e6e9d23ca8c87f8abb7 Mon Sep 17 00:00:00 2001 From: natemaia Date: Sun, 16 Dec 2018 21:16:27 -0800 Subject: [PATCH] Break up some messages with newlines --- src/archlabs-installer | 2 +- src/lib/boot.sh | 3 +++ src/lib/install.sh | 8 +++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/archlabs-installer b/src/archlabs-installer index 6031d6e..9fae3d4 100755 --- a/src/archlabs-installer +++ b/src/archlabs-installer @@ -10,7 +10,7 @@ # immutable globals -readonly VER="1.7.44" # Installer version +readonly VER="1.7.45" # Installer version readonly DIST="ArchLabs" # Linux distributor readonly MNT="/mnt" # Install mountpoint readonly ERR="/tmp/errlog" # Built-in error log diff --git a/src/lib/boot.sh b/src/lib/boot.sh index b0004ee..1f7a4a5 100644 --- a/src/lib/boot.sh +++ b/src/lib/boot.sh @@ -214,6 +214,7 @@ install_bootloader() echeck "${BCMDS[$BOOTLDR]}" if [[ -d $MNT/hostrun ]]; then + printf "\n" umount $MNT/hostrun/udev >/dev/null 2>&1 umount $MNT/hostrun/lvm >/dev/null 2>&1 rm -rf $MNT/hostrun >/dev/null 2>&1 @@ -237,6 +238,7 @@ uefi_boot_fallback() default="$(find $esp/EFI/ -maxdepth 1 -mindepth 1 -name '[Bb][oO][oO][tT]' -type d)" default="$(basename $default)" + printf "\n" if [[ -d $esp/EFI/$default ]]; then rm -rfv $esp/EFI/$default/* else @@ -245,6 +247,7 @@ uefi_boot_fallback() cp -fv $esp/EFI/$DIST/grubx64.efi $esp/EFI/$default/bootx64.efi + sleep 2 return 0 } diff --git a/src/lib/install.sh b/src/lib/install.sh index 984e046..2a0a874 100644 --- a/src/lib/install.sh +++ b/src/lib/install.sh @@ -57,7 +57,7 @@ install() install_base() { if [[ -e /run/archiso/sfs/airootfs/etc/skel ]]; then - printf "\n\nUnpacking base system --- Total: ~ 2.6G\n" + printf "\n\nUnpacking base system --- Total: ~ 2.6G\n\n" rsync -ah --info=progress2 /run/archiso/sfs/airootfs/ $MNT/ else oneshot mirrorlist_sort @@ -72,6 +72,7 @@ install_base() pacstrap $MNT base $KERNEL $UCODE $packages $vmpkgs fi + printf "\n" rm -rf $MNT/etc/mkinitcpio-archiso.conf find $MNT/usr/lib/initcpio -name 'archiso*' -type f -exec rm '{}' \; sed -i 's/volatile/auto/g' $MNT/etc/systemd/journald.conf @@ -94,10 +95,11 @@ EOF [[ $UCODE && ! $VM ]] && cp -vf $RUN/${UCODE/-/_}.img $MNT/boot/${UCODE}.img fi + printf "\n" + cp -fv /etc/resolv.conf $MNT/etc/ if [[ -e /etc/NetworkManager/system-connections ]]; then cp -rvf /etc/NetworkManager/system-connections $MNT/etc/NetworkManager/ fi - cp -fv /etc/resolv.conf $MNT/etc/ cat > $MNT/etc/locale.conf << EOF LANG=$LOCALE @@ -107,7 +109,7 @@ LANG=$LOCALE EOF sed -i "s/#en_US.UTF-8/en_US.UTF-8/g; s/#${LOCALE}/${LOCALE}/g" $MNT/etc/locale.gen chrun "echo && locale-gen" 2>/dev/null - + printf "\n" chrun "ln -svf /usr/share/zoneinfo/$ZONE/$SUBZONE /etc/localtime" 2>/dev/null if [[ $BROADCOM_WL == true ]]; then