From 4f54f0bdbdd6c866163c2e36fcdf58d50c47aab0 Mon Sep 17 00:00:00 2001
From: Suikan <26223147+suikan4github@users.noreply.github.com>
Date: Fri, 2 Jul 2021 07:49:22 +0900
Subject: [PATCH] Make warning message stronger.

Add comment to the error return
---
 script/common/confirmation.sh | 12 ++++++------
 script/common/parainstall.sh  |  3 ++-
 script/common/preinstall.sh   |  4 ++--
 script/ubuntu-kaiten-yaki.sh  | 11 ++++++-----
 script/void-kaiten-yaki.sh    |  9 +++++----
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/script/common/confirmation.sh b/script/common/confirmation.sh
index 8503411..9b47635 100644
--- a/script/common/confirmation.sh
+++ b/script/common/confirmation.sh
@@ -14,7 +14,7 @@ function confirmation(){
 
 		Installation terminated.
 		HEREDOC
-		return 1
+		return 1 # with error status
 	fi # "-" is found in the volume group name.
 
 	# Sanity check for root volume name
@@ -26,7 +26,7 @@ function confirmation(){
 
 		Installation terminated.
 		HEREDOC
-		return 1
+		return 1 # with error status
 	fi # "-" is found in the volume name.
 
 	# Sanity check for swap volume name
@@ -38,7 +38,7 @@ function confirmation(){
 
 		Installation terminated.
 		HEREDOC
-		return 1
+		return 1 # with error status
 	fi # "-" is found in the volume name.
 
 	# For surre ask the config.sh is edited
@@ -54,7 +54,7 @@ function confirmation(){
 
 		Installation terminated.
 		HEREDOC
-		return 1
+		return 1 # with error status
 	fi	# if YES
 
 	# For sure ask ready to erase. 
@@ -67,7 +67,7 @@ function confirmation(){
 
 		Installation terminated.
 		HEREDOC
-		return 1
+		return 1 # with error status
 		fi	# if YES
 	fi	# if erase all
 
@@ -87,7 +87,7 @@ function confirmation(){
 
 		Installation terminated.
 		HEREDOC
-		return 1
+		return 1 # with error status
 	fi	# passphrase validation
 
 	# succesfull return
diff --git a/script/common/parainstall.sh b/script/common/parainstall.sh
index c45c483..4dc73ab 100644
--- a/script/common/parainstall.sh
+++ b/script/common/parainstall.sh
@@ -18,7 +18,7 @@ function parainstall() {
 
 			Installation process terminated.
 			HEREDOC
-			return 1
+			return 1 # with error status
 		fi
 	done # while
 
@@ -32,6 +32,7 @@ function parainstall() {
 
 	# And then, wait for the end of installer process
 	echo "...Waiting for the end of GUI/TUI installer."
+	echo "...Again, DO NOT reboot here. Just exit the GUI/TUI installer."
 	wait $INSTALLER_PID
 
 	# succesfull return
diff --git a/script/common/preinstall.sh b/script/common/preinstall.sh
index 295a45d..68d49ff 100644
--- a/script/common/preinstall.sh
+++ b/script/common/preinstall.sh
@@ -54,7 +54,7 @@ function pre_install() {
 
 		Installation terminated.
 		HEREDOC
-		return 1
+		return 1 # with error status
 	fi	# if crypt volume is unable to open
 
 	# ----- Configure the LVM in LUKS volume -----
@@ -84,7 +84,7 @@ function pre_install() {
 
 		Installation terminated.
 		HEREDOC
-		return 1
+		return 1 # with error status
 	else
 		echo "...Create logical volume \"${LVROOTNAME}\" on \"${VGNAME}\"."
 		lvcreate -l ${LVROOTSIZE} -n ${LVROOTNAME} ${VGNAME}
diff --git a/script/ubuntu-kaiten-yaki.sh b/script/ubuntu-kaiten-yaki.sh
index 0e072fb..e1cc7be 100644
--- a/script/ubuntu-kaiten-yaki.sh
+++ b/script/ubuntu-kaiten-yaki.sh
@@ -29,7 +29,7 @@ function main() {
 
 			Installation terminated.
 			HEREDOC
-			return 1
+			return 1 # with error status
 		fi	# if YES
 
 	fi # "Ubuntu" is not found in the OS name.
@@ -40,7 +40,7 @@ function main() {
 
 	# Common part of the parameter confirmation
 	if ! confirmation ; then
-		return 1
+		return 1 # with error status
 	fi
 
 	# ******************************************************************************* 
@@ -49,7 +49,7 @@ function main() {
 
 	# Common part of the pre-install stage
 	if ! pre_install ; then
-		return 1
+		return 1 # with error status
 	fi
 
 
@@ -66,7 +66,8 @@ function main() {
 	************************ CAUTION! CAUTION! CAUTION! ****************************
 	
 	Make sure to click "Continue Testing",  at the end of the Ubiquity installer.
-	Just exit the installer without rebooting.
+	Just exit the installer without rebooting. Other wise, your system
+	is unable to boot. 
 
 	Type return key to start Ubiquity.
 	HEREDOC
@@ -84,7 +85,7 @@ function main() {
 	# Record the install PID, modify the /etc/default/grub of the target, 
 	# and then, wait for the end of sintaller. 
 	if ! parainstall ; then
-		return 1
+		return 1 # with error status
 	fi
 
 	# ******************************************************************************* 
diff --git a/script/void-kaiten-yaki.sh b/script/void-kaiten-yaki.sh
index 71e7011..584f073 100644
--- a/script/void-kaiten-yaki.sh
+++ b/script/void-kaiten-yaki.sh
@@ -40,7 +40,7 @@ function main() {
 
 	# Common part of the parameter confirmation
 	if ! confirmation ; then
-		return 1
+		return 1 # with error status
 	fi
 
 	# ******************************************************************************* 
@@ -52,7 +52,7 @@ function main() {
 
 	# Common part of the pre-install stage
 	if ! pre_install ; then
-		return 1
+		return 1 # with error status
 	fi
 
 	# ADD "rd.auto=1 cryptdevice=/dev/sda2:${CRYPTPARTNAME} root=/dev/mapper/${VGNAME}-${ROOTNAME}" to GRUB.
@@ -74,7 +74,8 @@ function main() {
 	************************ CAUTION! CAUTION! CAUTION! ****************************
 	
 	Make sure to click "NO", if the void-installer ask you to reboot.
-	Just exit the installer without rebooting.
+	Just exit the installer without rebooting. Other wise, your system
+	is unable to boot. 
 
 	Type return key to start void-installer.
 	HEREDOC
@@ -92,7 +93,7 @@ function main() {
 	# Record the install PID, modify the /etc/default/grub of the target, 
 	# and then, wait for the end of sintaller. 
 	if ! parainstall ; then
-		return 1
+		return 1 # with error status
 	fi
 
 	# *******************************************************************************