From a28dbcaa74b07ca0add83eb8b89d47d57cc1657f Mon Sep 17 00:00:00 2001
From: Suikan <26223147+suikan4github@users.noreply.github.com>
Date: Fri, 2 Jul 2021 08:49:25 +0900
Subject: [PATCH] Add "..." to Install process termination message

---
 script/common/confirmation.sh | 27 ++++++++++++++-------------
 script/common/parainstall.sh  |  4 ++--
 script/common/preinstall.sh   |  8 ++++----
 script/ubuntu-kaiten-yaki.sh  |  2 +-
 script/void-kaiten-yaki.sh    |  2 +-
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/script/common/confirmation.sh b/script/common/confirmation.sh
index 9b47635..f9d6ddd 100644
--- a/script/common/confirmation.sh
+++ b/script/common/confirmation.sh
@@ -9,10 +9,10 @@ function confirmation(){
 	if echo ${VGNAME} | grep "-" -i > /dev/null ; then	# "-" is found in the volume group name.
 		cat <<- HEREDOC 1>&2
 		***** ERROR : VGNAME is "${VGNAME}" *****
-		"-" is not allowed in the volume name. 
-		Check passphrase and config.txt
+		..."-" is not allowed in the volume name. 
+		...Check passphrase and config.txt
 
-		Installation terminated.
+		...Installation process terminated..
 		HEREDOC
 		return 1 # with error status
 	fi # "-" is found in the volume group name.
@@ -21,10 +21,10 @@ function confirmation(){
 	if echo ${LVROOTNAME} | grep "-" -i > /dev/null ; then	# "-" is found in the volume name.
 		cat <<- HEREDOC 1>&2
 		***** ERROR : LVROOTNAME is "${LVROOTNAME}" *****
-		"-" is not allowed in the volume name. 
-		Check passphrase and config.txt
+		..."-" is not allowed in the volume name. 
+		...Check passphrase and config.txt
 
-		Installation terminated.
+		...Installation process terminated..
 		HEREDOC
 		return 1 # with error status
 	fi # "-" is found in the volume name.
@@ -33,10 +33,10 @@ function confirmation(){
 	if echo ${LVSWAPNAME} | grep "-" -i > /dev/null ; then	# "-" is found in the volume name.
 		cat <<- HEREDOC 1>&2
 		***** ERROR : LVSWAPNAME is "${LVSWAPNAME}" *****
-		"-" is not allowed in the volume name. 
-		Check passphrase and config.txt
+		..."-" is not allowed in the volume name. 
+		...Check passphrase and config.txt
 
-		Installation terminated.
+		...Installation process terminated..
 		HEREDOC
 		return 1 # with error status
 	fi # "-" is found in the volume name.
@@ -52,7 +52,7 @@ function confirmation(){
 	if [ ${YESNO} != "Y" -a ${YESNO} != "y" ] ; then
 		cat <<- HEREDOC 1>&2
 
-		Installation terminated.
+		...Installation process terminated..
 		HEREDOC
 		return 1 # with error status
 	fi	# if YES
@@ -63,9 +63,9 @@ function confirmation(){
 		read YESNO
 		if [ ${YESNO} != "Y" -a ${YESNO} != "y" ] ; then
 			cat <<-HEREDOC 1>&2
-		Check config.sh. The variable ERASEALL is ${ERASEALL}.
+		...Check config.sh. The variable ERASEALL is ${ERASEALL}.
 
-		Installation terminated.
+		...Installation process terminated..
 		HEREDOC
 		return 1 # with error status
 		fi	# if YES
@@ -73,6 +73,7 @@ function confirmation(){
 
 	# ----- Set Passphrase -----
 	# Input passphrase
+	echo ""
 	echo "Type passphrase for the disk encryption."
 	read -sr PASSPHRASE
 	export PASSPHRASE
@@ -85,7 +86,7 @@ function confirmation(){
 		cat <<-HEREDOC 1>&2
 		***** ERROR : Passphrase doesn't match *****
 
-		Installation terminated.
+		...Installation process terminated..
 		HEREDOC
 		return 1 # with error status
 	fi	# passphrase validation
diff --git a/script/common/parainstall.sh b/script/common/parainstall.sh
index 3728280..88d149f 100644
--- a/script/common/parainstall.sh
+++ b/script/common/parainstall.sh
@@ -14,13 +14,13 @@ function parainstall() {
 		# Check if installer still exist
 		if ! ps $INSTALLER_PID  > /dev/null ; then	# If not exists
 			cat <<-HEREDOC 1>&2
-			The installer terminated unexpectedly. 
+			...The installer terminated unexpectedly. 
 			...Delete the new logical volume "${VGNAME}-${LVROOTNAME}".
 			HEREDOC
 			lvremove -f /dev/mapper/${VGNAME}-${LVROOTNAME} 
 			cat <<-HEREDOC 1>&2
 
-			Installation process terminated.
+			...Installation process terminated.
 			HEREDOC
 			return 1 # with error status
 		fi
diff --git a/script/common/preinstall.sh b/script/common/preinstall.sh
index 0e06690..2251947 100644
--- a/script/common/preinstall.sh
+++ b/script/common/preinstall.sh
@@ -50,9 +50,9 @@ function pre_install() {
 	if [ ! -e /dev/mapper/${CRYPTPARTNAME} ] ; then 
 		cat <<- HEREDOC 1>&2
 		***** ERROR : Cannot open LUKS volume "${CRYPTPARTNAME}" on ${DEV}${CRYPTPARTITION}. *****
-		Check passphrase and config.txt
+		...Check passphrase and config.txt
 
-		Installation terminated.
+		...Installation process terminated..
 		HEREDOC
 		return 1 # with error status
 	fi	# if crypt volume is unable to open
@@ -82,9 +82,9 @@ function pre_install() {
 	if [ -e /dev/mapper/${VGNAME}-${LVROOTNAME} ] ; then 
 		cat <<- HEREDOC 1>&2
 		***** ERROR : Logical volume "${VGNAME}-${LVROOTNAME}" already exists. *****
-		Check LVROOTNAME environment variable in config.txt.
+		...Check LVROOTNAME environment variable in config.txt.
 
-		Installation terminated.
+		...Installation process terminated..
 		HEREDOC
 		return 1 # with error status
 	else
diff --git a/script/ubuntu-kaiten-yaki.sh b/script/ubuntu-kaiten-yaki.sh
index e1cc7be..7412c4f 100644
--- a/script/ubuntu-kaiten-yaki.sh
+++ b/script/ubuntu-kaiten-yaki.sh
@@ -27,7 +27,7 @@ function main() {
 		if [ ${YESNO} != "Y" -a ${YESNO} != "y" ] ; then
 			cat <<- HEREDOC 1>&2
 
-			Installation terminated.
+			...Installation process terminated..
 			HEREDOC
 			return 1 # with error status
 		fi	# if YES
diff --git a/script/void-kaiten-yaki.sh b/script/void-kaiten-yaki.sh
index 584f073..02368d7 100644
--- a/script/void-kaiten-yaki.sh
+++ b/script/void-kaiten-yaki.sh
@@ -27,7 +27,7 @@ function main() {
 		if [ ${YESNO} != "Y" -a ${YESNO} != "y" ] ; then
 			cat <<- HEREDOC 1>&2
 
-			Installation terminated.
+			...Installation process terminated..
 			HEREDOC
 			return
 		fi	# if YES