fix error, fix msgs

restore.sh

@@ -101,19 +101,18 @@ echo w
 
 ##mkfs's
 echo "==> Making filesystems..."
-echo "mkswap"
+echo "=> swap"
 mkswap $targetDrive"1"
-echo "mkfs.vfat"
+echo "=> /boot"
 mkfs.vfat $targetDrive"2"
 
-echo "mkfs.ext4"
-if $encryptedDevice
-then
+echo "=> rootfs"
+if $encryptedDevice then
 cryptsetup luksFormat -v $targetDrive"3"
 cryptsetup open $targetDrive"3" targetLuks
-mkfs.ext4 /dev/mapper/targetLuks
+mkfs.ext4 -q /dev/mapper/targetLuks
 else
-mkfs.ext4 $targetDrive"3"
+mkfs.ext4 -q $targetDrive"3"
 fi
 
 sleep 15
@@ -121,16 +120,14 @@ sleep 15
 ##get disk's uuid
 echo "==> Got UUIDs!"
 UUIDS=($(blkid $targetDrive"1" $targetDrive"2" $targetDrive"3" -o value -s UUID))
-if $encryptedDevice
-then
+if $encryptedDevice then
 UUIDS[3]=UUIDS[2]
 UUIDS[2]=`blkid /dev/mapper/targetLuks -o value -s UUID`
 fi
 
 ##mount disks
 echo "==> Mounting..."
-if $encryptedDevice
-then
+if $encryptedDevice then
 mount /dev/mapper/targetLuks /mnt
 else
 mount $targetDrive"3" /mnt
@@ -159,10 +156,10 @@ rm /mnt/etc/fstab.orig #TODO OFC we need to check mountpoint, not only type of F
 echo "==> Result:"
 cat /mnt/etc/fstab
 ##update grub linux options
-if $encryptedDevice
-cat /mnt/etc/default/grub | sed 's/cryptdevice=UUID=[A-Fa-f0-9-]*:cryptroot /cryptdevice=UUID='${UUIDS[3]}':cryptroot/' > /mnt/etc/default/grub 
+if $encryptedDevice then
+	cat /mnt/etc/default/grub | sed 's/cryptdevice=UUID=[A-Fa-f0-9-]*:cryptroot /cryptdevice=UUID='${UUIDS[3]}':cryptroot/' > /mnt/etc/default/grub 
 else
-cat /mnt/etc/default/grub | sed 's/cryptdevice=UUID=[A-Fa-f0-9-]*:cryptroot //' > /mnt/etc/default/grub
+	cat /mnt/etc/default/grub | sed 's/cryptdevice=UUID=[A-Fa-f0-9-]*:cryptroot //' > /mnt/etc/default/grub
 fi
 
 cat /mnt/etc/default/grub | sed 's/resume=UUID=[A-Fa-f0-9-]*/resume=UUID='${UUIDS[0]}'/' > /mnt/etc/default/grub