From d5174bbab5daace17dbe57435a6fbb53584c6a73 Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Mon, 17 Dec 2018 20:23:47 -0800
Subject: [PATCH] Formatting change in luks_pass()

---
 src/archlabs-installer | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/archlabs-installer b/src/archlabs-installer
index 733ab90..b900f75 100755
--- a/src/archlabs-installer
+++ b/src/archlabs-installer
@@ -8,7 +8,7 @@
 # Some ideas and code has been taken from other installers
 # AIF, Cnichi, Calamares, The Arch Wiki.. Credit where credit is due
 
-VER="1.7.57"                             # Installer version
+VER="1.7.60"                             # Installer version
 DIST="ArchLabs"                          # Installer distributor
 MNT="/mnt"                               # Installer mountpoint
 ERR="/tmp/errlog"                        # error log used internally
@@ -925,7 +925,7 @@ mount_partition()
     fs="$(lsblk -lno FSTYPE $part)"
     mkdir -p "$mountp"
 
-    if [[ ${FS_OPTS[$fs]} && $part != "$BOOT_PART" ]] && select_mount_opts "$part" "$fs"; then
+    if [[ $fs && ${FS_OPTS[$fs]} && $part != "$BOOT_PART" ]] && select_mount_opts "$part" "$fs"; then
         mount -o $MNT_OPTS $part "$mountp" 2>$ERR
         errshow "mount -o $MNT_OPTS $part $mountp"
     else
@@ -1278,11 +1278,9 @@ lvm_detect()
     VOLUMES="$(lvs -o vg_name,lv_name --noheading --separator - 2>/dev/null)"
 
     if [[ $VOLUMES && $VOLUME_GROUP && $PHYSICAL_VOLUMES ]]; then
-        infobox "$_PrepLVM" "$_LvmDetBody" 0
-
+        infobox "$_PrepLVM" "$_LvmDetBody" 1
         modprobe dm-mod 2>$ERR
         errshow 'modprobe dm-mod'
-
         vgscan >/dev/null 2>&1
         vgchange -ay >/dev/null 2>&1
     fi
@@ -1422,7 +1420,7 @@ lvm_extra_lvs()
         get_lv_size || { break; return 1; }
 
         # create it
-        lvcreate -L "$VOLUME_SIZE" "$VOLUME_GROUP" -n "$VOLUME_NAME" 2>$ERR
+        lvcreate -L "$VOLUME_SIZE" "$VOLUME_GROUP" -n "$VOLUME_NAME" >/dev/null 2>$ERR
         errshow "lvcreate -L $VOLUME_SIZE $VOLUME_GROUP -n $VOLUME_NAME"
         msgbox "$_LvmCreateVG (LV:$VOL_COUNT)" "$_Done LV $VOLUME_NAME ($VOLUME_SIZE) $_LvmPvDoneBody2."
 
@@ -1514,14 +1512,14 @@ lvm_create()
 
     # last or only logical volume
     lvm_volume_name "$_LvmLvNameBody1 $_LvmLvNameBody2 (${VOL_GROUP_MB}MB)" || return 1
-    lvcreate -l +100%FREE "$VOLUME_GROUP" -n "$VOLUME_NAME" 2>$ERR
+    lvcreate -l +100%FREE "$VOLUME_GROUP" -n "$VOLUME_NAME" >/dev/null 2>$ERR
     errshow "lvcreate -l +100%FREE $VOLUME_GROUP -n $VOLUME_NAME"
 
     LVM=' logical volume'
 
     tput civis
     sleep 0.5
-    local msg="${_Done}$_LvmPvDoneBody1 $VOLUME_NAME ($VOLUME_SIZE) $_LvmPvDoneBody2."
+    local msg="${_Done}$_LvmPvDoneBody1 $VOLUME_GROUP-$VOLUME_NAME (${VOLUME_SIZE:-${VOL_GROUP_MB}MB}) $_LvmPvDoneBody2."
     msgbox "$_LvmCreateVG (LV:$VOL_COUNT)" "$msg\n\n$(lsblk -o NAME,MODEL,TYPE,FSTYPE,SIZE $GROUP_PARTS)"
 
     return 0
@@ -1600,7 +1598,7 @@ luks_pass()
         if ! values="$(dialog --stdout --separator '~' --ok-label "Submit" \
             --backtitle "$BT" --title " $title " --insecure --mixedform \
             "\nEnter the password to decrypt $ROOT_PART.
-            \nThis is needed to create a keyfile." 16 75 3 \
+            \nThis is needed to create a keyfile." 14 75 3 \
             "$_Password"  1 1 ""      1 $((${#_Password} + 2))  71 0 1 \
             "$_Password2" 2 1 ""      2 $((${#_Password2} + 2)) 71 0 1)"; then
             return 1