Reduced code in new util scripts.

19 files changed, 29 insertions, 40 deletions

diff --git a/util/check_bootmode.sh b/util/check_bootmode.sh
index 32df553..560e2b7 100644
--- a/util/check_bootmode.sh
+++ b/util/check_bootmode.sh
@@ -18,13 +18,10 @@
 #  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
-# Check if booted with UEFI
-
 if [ -d "/sys/firmware/efi/efivars" ]; then
-    echo "Booted with UEFI - OK"
-    echo ""
-    sleep $DELAY
+    echo "Booted with UEFI"
+    echo "Checked bootmode - OK"
 else
     echo "Not booted with UEFI. Please enable it in your mainboard settings. - FAILED"
-    exit
+    echo "Checked bootmode - OK"
 fi
diff --git a/util/configure_desktop.sh b/util/configure_desktop.sh
index ec30e25..c002e70 100644
--- a/util/configure_desktop.sh
+++ b/util/configure_desktop.sh
@@ -32,3 +32,5 @@ Section "InputClass"
         Option "XkbVariant" "nodeadkeys"
 EndSection
 EOF
+
+echo "Configured desktop - OK"
diff --git a/util/configure_keyboard.sh b/util/configure_keyboard.sh
index 7a3b50f..f492e43 100644
--- a/util/configure_keyboard.sh
+++ b/util/configure_keyboard.sh
@@ -20,3 +20,5 @@
 
 touch /etc/vconsole.conf
 echo "KEYMAP=de-latin1" > /etc/vconsole.conf
+
+echo "Keyboard configuration done - OK"
diff --git a/util/configure_locales.sh b/util/configure_locales.sh
index bc8ebb0..3488bb7 100644
--- a/util/configure_locales.sh
+++ b/util/configure_locales.sh
@@ -26,3 +26,5 @@ locale-gen
 
 touch /etc/locale.conf
 echo "LANG=de_DE.UTF-8" > /etc/locale.conf
+
+echo "Configured locales - OK"
diff --git a/util/configure_network.sh b/util/configure_network.sh
index f71a856..6d07280 100644
--- a/util/configure_network.sh
+++ b/util/configure_network.sh
@@ -28,6 +28,4 @@ echo "::1       localhost" >> /etc/hosts
 
 systemctl enable dhcpcd
 
-echo "Network configuration done - OK"
-echo ""
-sleep 1
+echo "Configured network - OK"
diff --git a/util/configure_timezone.sh b/util/configure_timezone.sh
index 231c212..f567832 100644
--- a/util/configure_timezone.sh
+++ b/util/configure_timezone.sh
@@ -20,6 +20,4 @@
 
 ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime
 hwclock --systohc
-echo "Timezone set - OK"
-echo ""
-sleep 1
+echo "Configured timezone - OK"
diff --git a/util/configure_users.sh b/util/configure_users.sh
index 2e7b5b5..3d482c0 100644
--- a/util/configure_users.sh
+++ b/util/configure_users.sh
@@ -19,6 +19,4 @@
 
 
 echo "root:root" | chpasswd
-echo "Default password for user root set - OK"
-echo ""
-sleep 1
+echo "Configured users - OK"
diff --git a/util/copy_archinstall_config.sh b/util/copy_archinstall_config.sh
index 7a9e5e7..8a7b04a 100644
--- a/util/copy_archinstall_config.sh
+++ b/util/copy_archinstall_config.sh
@@ -19,3 +19,5 @@
 
 
 cp $LOG_FILE_PATH /mnt$LOG_FILE_PATH
+
+echo "Copied archinstall configuration - OK"
diff --git a/util/copy_archinstall_log.sh b/util/copy_archinstall_log.sh
index 845e26c..1c5f3af 100644
--- a/util/copy_archinstall_log.sh
+++ b/util/copy_archinstall_log.sh
@@ -20,3 +20,5 @@
 
 mkdir /mnt$(dirname "$CONFIG_FILE_PATH")
 cp $CONFIG_FILE_PATH /mnt$CONFIG_FILE_PATH
+
+echo "Copied archinstall log - OK"
diff --git a/util/create_filesystems.sh b/util/create_filesystems.sh
index b14d0f6..8a58909 100644
--- a/util/create_filesystems.sh
+++ b/util/create_filesystems.sh
@@ -23,5 +23,3 @@ mkfs.ext4 $root_partition_path
 fatlabel $boot_partition_path "BOOT"
 e2label $root_partition_path "ROOT"
 echo "Created filesystems - OK"
-sleep $DELAY
-echo ""
diff --git a/util/install_archinstall.sh b/util/install_archinstall.sh
index d0d75f6..2b37073 100644
--- a/util/install_archinstall.sh
+++ b/util/install_archinstall.sh
@@ -19,3 +19,5 @@
 
 
 cp -r $REPOSITORY_PATH /mnt$REPOSITORY_PATH
+
+echo "Installed archinstall - OK"
diff --git a/util/install_bootloader.sh b/util/install_bootloader.sh
index 411b530..4bf6ab5 100644
--- a/util/install_bootloader.sh
+++ b/util/install_bootloader.sh
@@ -18,13 +18,9 @@
 #  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
-# Install Grub
-
 mount $1 /mnt
 grub-install --target=x86_64-efi --efi-directory=/mnt --bootloader-id=GRUB \
 --removable
 grub-mkconfig -o /boot/grub/grub.cfg
 umount $1
-echo "Grub bootloader installed - OK"
-echo ""
-sleep 1
+echo "Installed bootloader - OK"
diff --git a/util/install_packages.sh b/util/install_packages.sh
index 5ca1ea8..8515675 100644
--- a/util/install_packages.sh
+++ b/util/install_packages.sh
@@ -18,14 +18,9 @@
 #  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
-echo "Going to install packages ..."
-sleep $DELAY
-echo ""
 pacstrap /mnt base linux linux-firmware dhcpcd nano sudo grub efibootmgr
 if [ "$desktop" = "yes" ]; then
     pacstrap /mnt xorg lightdm lightdm-gtk-greeter xfce4 mousepad
 fi
-echo ""
+
 echo "Installed packages - OK"
-sleep $DELAY
-echo ""
diff --git a/util/mount_filesystems.sh b/util/mount_filesystems.sh
index a3c3721..f426ca2 100644
--- a/util/mount_filesystems.sh
+++ b/util/mount_filesystems.sh
@@ -19,6 +19,4 @@
 
 
 mount $root_partition_path /mnt
-echo "Mounted root partition - OK"
-sleep $DELAY
-echo ""
+echo "Mounted filesystems - OK"
diff --git a/util/partition_disk.sh b/util/partition_disk.sh
index a20a7f1..bffe87f 100644
--- a/util/partition_disk.sh
+++ b/util/partition_disk.sh
@@ -35,6 +35,5 @@ w
 EOF
 boot_partition_path="${disk_path}1"
 root_partition_path="${disk_path}2"
-echo "Partitioning finished - OK"
-sleep $DELAY
-echo ""
+
+echo "Partitioned disk - OK"
diff --git a/util/print_final_message.sh b/util/print_final_message.sh
index 70cabd6..2388c23 100644
--- a/util/print_final_message.sh
+++ b/util/print_final_message.sh
@@ -29,3 +29,5 @@ cat << EOF
 #################################################################
 
 EOF
+
+echo "Printed final message - OK"
diff --git a/util/unmount_filesystems.sh b/util/unmount_filesystems.sh
index ad7ca26..95d7101 100644
--- a/util/unmount_filesystems.sh
+++ b/util/unmount_filesystems.sh
@@ -19,6 +19,4 @@
 
 
 cd /root && umount $root_partition_path
-echo "Unmounted root partition - OK"
-sleep $DELAY
-echo ""
+echo "Unmounted filesystems - OK"
diff --git a/util/write_config.py b/util/write_config.py
index ee4eedd..9545611 100644
--- a/util/write_config.py
+++ b/util/write_config.py
@@ -63,3 +63,5 @@ with open(config_file_path, 'w') as f:
 
 print("Config for this installation:")
 print(config_json)
+
+print("Wrote config - OK")
diff --git a/util/write_fstab.sh b/util/write_fstab.sh
index ae59d8e..7321c54 100644
--- a/util/write_fstab.sh
+++ b/util/write_fstab.sh
@@ -19,6 +19,4 @@
 
 
 genfstab -U /mnt >> /mnt/etc/fstab
-echo "Generated /etc/fstab - OK"
-sleep $DELAY
-echo ""
+echo "Wrote /etc/fstab - OK"