feat: cleanup

modules/10-chroot/10-bootloader.sh

@@ -5,10 +5,10 @@ root="$(findmnt -n -osource /)"
 boot="$(lsblk -ls -oname /dev/disk/by-partlabel/boot | tail -n1)"
 
 cryptdev="$(cryptsetup status "$root" | awk '/device/ {print $2}')"
-[ -n "$cryptdev" ] && {
+if [ -n "$cryptdev" ]; then
     uuid="$(blkid | grep "$cryptdev" | awk '{print $2}')"
     options="cryptdevice=$uuid:${root##*/} "
-}
+fi
 
 options="${options}root=$root rw"
 

modules/10-chroot/20-users.sh

@@ -4,5 +4,7 @@
 shell="$(sed -n "/$shell/{p;q}" /etc/shells)"
 useradd -mG wheel,video "$username" -s "${shell:-/bin/bash}"
 
-[ -n "$rootpasswd" ] && echo "root:$rootpasswd" | chpasswd
+if [ -n "$rootpasswd" ]; then
+    echo "root:$rootpasswd" | chpasswd
+fi
 echo "$username:$userpasswd" | chpasswd

modules/10-chroot/40-flatpak.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-#shellcheck disable=SC2154
-
-[ -s /chroot/flatpak.txt ] \
-    && xargs flatpak install -y --noninteractive < /chroot/flatpak.txt