From 1ee412ee12ef5384c094d64f41e2c85531e2db57 Mon Sep 17 00:00:00 2001
From: Suikan <26223147+suikan4github@users.noreply.github.com>
Date: Tue, 29 Jun 2021 06:14:43 +0900
Subject: [PATCH] Refactored script

Add config.txt confirmation
Erase all check is moved to before passphrase
Add more comment
---
 ubuntu/1-pre-install.sh  | 102 ++++++++++++++++++++++-----------------
 ubuntu/2-para-install.sh |  11 +++--
 ubuntu/3-post-install.sh |   7 +--
 3 files changed, 67 insertions(+), 53 deletions(-)

diff --git a/ubuntu/1-pre-install.sh b/ubuntu/1-pre-install.sh
index 2d52230..c5d95d7 100644
--- a/ubuntu/1-pre-install.sh
+++ b/ubuntu/1-pre-install.sh
@@ -8,48 +8,61 @@ if [ $sourced -eq 0 ] ; then
 Execute as following : 
 source 1-pre-install.sh
 
-Installation terminates.
+Installation terminated.
 HEREDOC
-	exit
-fi
-
-
-# ----- Set Passphrase -----
-# Input passphrase
-echo "Type passphrase for the disk encryption."
-read -sr PASSPHRASE
-
-echo "Type passphrase again, to confirm."
-read -sr PASSPHRASE_C
-
-# Validate whether both are indentical or not
-if [ ${PASSPHRASE} = ${PASSPHRASE_C} ] ; then
-	export PASSPHRASE
-else
-	cat <<HEREDOC 1>&2
-***** ERROR : Passphrase doesn't match *****
-Installation terminates.
-HEREDOC
-	return
-fi
+	exit    # use "exit" instead of "return", if not "sourced" execusion
+fi # "sourced" validation
 
 # ----- Configuration Parameter -----
 # Load the configuration parameter
 source config.sh
 
-# ----- Format the disk and encrypt the LUKS partition -----
-if [ ${ERASEALL} -eq 1 ] ; then
+# For surre ask the config.sh is edited
+echo "Did you edit config.sys? Are you ready to install? [Y/N]"
+read YESNO
+if [ YESNO != "Y" -a YESNO != "y" ] ; then
+	cat <<HEREDOC 1>&2
+
+Installation terminated.
+HEREDOC
+	return
+fi	# if YES
+
+
 # For sure ask ready to erase. 
+if [ ${ERASEALL} -eq 1 ] ; then
 	echo "Are you sure you want to erase entire ${DEV}? [Y/N]"
 	read YESNO
 	if [ YESNO != "Y" -a YESNO != "y" ] ; then
 		cat <<HEREDOC 1>&2
 Check config.sh. The ERASEALL is ${ERASEALL}.
 
-Installation terminates.
+Installation terminated.
 HEREDOC
 		return
-	fi
+	fi	# if YES
+fi	# if erase all
+
+# ----- Set Passphrase -----
+# Input passphrase
+echo "Type passphrase for the disk encryption."
+read -sr PASSPHRASE
+export PASSPHRASE
+
+echo "Type passphrase again, to confirm."
+read -sr PASSPHRASE_C
+
+# Validate whether both are indentical or not
+if [ ${PASSPHRASE} != ${PASSPHRASE_C} ] ; then
+	cat <<HEREDOC 1>&2
+***** ERROR : Passphrase doesn't match *****
+Installation terminated.
+HEREDOC
+	return
+fi	# passphrase validation
+
+# ----- Erase entire disk, create partitions, format them  and encrypt the LUKS partition -----
+if [ ${ERASEALL} -eq 1 ] ; then
 
 	# Assign specified space and rest of disk to the EFI and LUKS partition, respectively.
 	if [  ${ISEFI} -eq 1 ] ; then
@@ -69,29 +82,27 @@ HEREDOC
 		sfdisk ${DEV} <<HEREDOC
 2M,,L
 HEREDOC
-	fi
-	# if EFI firmware
+	fi	# if EFI firmware
 
 	# Encrypt the partition to install Linux
 	printf %s "${PASSPHRASE}" | cryptsetup luksFormat --type=luks1 --key-file - --batch-mode "${DEV}${CRYPTPARTITION}"
 
-fi
-# if erase all
+fi	# if erase all
 
 # ----- Open the LUKS partition -----
-# Open the created crypt partition. 
+# Open the crypt partition. 
 printf %s "${PASSPHRASE}" | cryptsetup open -d - "${DEV}${CRYPTPARTITION}" ${CRYPTPARTNAME}
 
 # Check whether successful open. If mapped, it is successful. 
 if [ ! -e /dev/mapper/${CRYPTPARTNAME} ] ; then 
 	cat <<HEREDOC 1>&2
 ***** ERROR : Cannot open LUKS volume ${CRYPTPARTNAME} on ${DEV}${CRYPTPARTITION}. *****
-Check the passphrase
+Check passphrase and config.txt
 
-Installation terminates.
+Installation terminated.
 HEREDOC
 	return
-fi
+fi	# if crypt volume is unable to open
 
 # ----- Configure the LVM in LUKS volume -----
 # The swap volume and / volume is created here, based on the given parameters. 
@@ -100,25 +111,26 @@ pvcreate /dev/mapper/${CRYPTPARTNAME}
 vgcreate ${VGNAME} /dev/mapper/${CRYPTPARTNAME}
 
 # Create a SWAP Logical Volume on VG, if it doesn't exist
-if [ ! -d /dev/mapper/${VGNAME}-${LVSWAPNAME} ] ; then 
-	lvcreate -L ${LVSWAPSIZE} -n ${LVSWAPNAME} ${VGNAME} 
-else
+if [ -d /dev/mapper/${VGNAME}-${LVSWAPNAME} ] ; then 
 	echo "Swap volume already exist. Skipped to create" 1>&2
-fi
+else
+	lvcreate -L ${LVSWAPSIZE} -n ${LVSWAPNAME} ${VGNAME} 
+fi	# if /dev/mapper/swap volume already exit. 
 
 # Create a ROOT Logical Volume on VG. 
-if [ ! -d /dev/mapper/${VGNAME}-${LVROOTNAME} ] ; then 
-	lvcreate -l ${LVROOTSIZE} -n ${LVROOTNAME} ${VGNAME}
-else
+if [ -d /dev/mapper/${VGNAME}-${LVROOTNAME} ] ; then 
 	cat <<HEREDOC 1>&2
 ***** ERROR : Logical volume ${VGNAME}-${LVROOTNAME} already exists. *****
-Check LVROOTNAME environment variable.
+Check LVROOTNAME environment variable in config.txt.
 
-Installation terminates.
+Installation terminated.
 HEREDOC
 	return
-fi
+else
+	lvcreate -l ${LVROOTSIZE} -n ${LVROOTNAME} ${VGNAME}
+fi	# if the root volun already exist
 
+# Finishing message
 cat <<HEREDOC
 
 1-pre-install.sh : Done. Next, run the Ubiquity installer.
diff --git a/ubuntu/2-para-install.sh b/ubuntu/2-para-install.sh
index 68ec125..d91587a 100644
--- a/ubuntu/2-para-install.sh
+++ b/ubuntu/2-para-install.sh
@@ -8,10 +8,10 @@ if [ $sourced -eq 0 ] ; then
 Execute as following : 
 source 2-para-install.sh
 
-Installation terminates.
+Installation terminated.
 HEREDOC
-	exit
-fi
+	exit    # use "exit" instead of "return", if not "sourced" execusion
+fi # "sourced" validation
 
 
 # Check whether grub configuration file is ready to write
@@ -20,14 +20,15 @@ if [ ! -e /target/etc/default/grub ] ; then
 ***** ERROR : The /target/etc/default/grub is not ready. *****
 Perhaps, to early to execute this script.
 
-Installation terminates.
+Installation terminated.
 HEREDOC
 	return
-fi
+fi  # if grub file exists
 
 # Make target GRUB aware to the crypt partition
 echo "GRUB_ENABLE_CRYPTODISK=y" >> /target/etc/default/grub
 
+# Finishing message
 cat <<HEREDOC
 
 2-para-install.sh : Done. 
diff --git a/ubuntu/3-post-install.sh b/ubuntu/3-post-install.sh
index 231be7f..89b12e1 100644
--- a/ubuntu/3-post-install.sh
+++ b/ubuntu/3-post-install.sh
@@ -8,10 +8,10 @@ if [ $sourced -eq 0 ] ; then
 Execute as following : 
 source 3-post-install.sh
 
-Installation terminates.
+Installation terminated.
 HEREDOC
-	exit
-fi
+	exit    # use "exit" instead of "return", if not "sourced" execusion
+fi # "sourced" validation
 
 ## Mount the target file system
 # /target is created by the Ubiquity installer
@@ -49,6 +49,7 @@ update-initramfs -uk all
 exit
 HEREDOC
 
+# Finishing message
 cat <<HEREDOC
 
 3-pro-install.sh : Done. Ready to reboot.