From 3a5446c6ad6d75e93238112d38dd9c391889db4e Mon Sep 17 00:00:00 2001
From: Suikan <26223147+suikan4github@users.noreply.github.com>
Date: Thu, 1 Jul 2021 15:36:52 +0900
Subject: [PATCH] Modify the message expose in para-install stage

Now, void doesn't show
---
 script/common/_parainstall.sh | 4 ++--
 script/ubuntu-kaiten-yaki.sh  | 3 ++-
 script/void-kaiten-yaki.sh    | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/script/common/_parainstall.sh b/script/common/_parainstall.sh
index c9ce0f2..37b7502 100644
--- a/script/common/_parainstall.sh
+++ b/script/common/_parainstall.sh
@@ -26,7 +26,7 @@ sleep 1 # 1sec.
 # Make target GRUB aware to the crypt partition
 # This must do it after start of the file copy by installer, but before the end of the file copy.
 # If the environment is not GUI, keep quiet not to bother the TUI installer. 
-if [ $GUIENV -eq 1 ]; then
+if [ $PARINSTMSG -eq 1 ]; then
 	echo "...Add GRUB_ENABLE_CRYPTODISK entry to ${TARGETMOUNTPOINT}/etc/default/grub "
 fi
 echo "GRUB_ENABLE_CRYPTODISK=y" >> ${TARGETMOUNTPOINT}/etc/default/grub
@@ -34,7 +34,7 @@ echo "GRUB_ENABLE_CRYPTODISK=y" >> ${TARGETMOUNTPOINT}/etc/default/grub
 
 # And then, wait for the end of installer process
 # If the environment is not GUI, keep quiet not to bother the TUI installer. 
-if [ $GUIENV -eq 1 ]; then
+if [ $PARAINSTMSG -eq 1 ]; then
 	echo "...Waiting for the end of GUI/TUI installer."
 fi
 wait $installer_pid
diff --git a/script/ubuntu-kaiten-yaki.sh b/script/ubuntu-kaiten-yaki.sh
index f009f0a..709f635 100644
--- a/script/ubuntu-kaiten-yaki.sh
+++ b/script/ubuntu-kaiten-yaki.sh
@@ -17,8 +17,9 @@ HEREDOC
 fi # "sourced" validation
 
 # This is the mount point of the install target. 
-# Refered in the para-install stage
 export TARGETMOUNTPOINT="/target"
+# 1 : Show message during GUI/TUI installer, 0 : Do not show.
+export PARAINSTMSG=1
 
 # Distribution check
 if ! uname -a | grep ubuntu -i > /dev/null  ; then	# "Ubuntu" is not found in the OS name.
diff --git a/script/void-kaiten-yaki.sh b/script/void-kaiten-yaki.sh
index 70819b1..cf9b655 100644
--- a/script/void-kaiten-yaki.sh
+++ b/script/void-kaiten-yaki.sh
@@ -17,8 +17,9 @@ HEREDOC
 fi # "sourced" validation
 
 # This is the mount point of the install target. 
-# Refered in the para-install stage
 export TARGETMOUNTPOINT="/mnt/target"
+# 1 : Show message during GUI/TUI installer, 0 : Do not show.
+export PARAINSTMSG=0
 
 # Distribution check
 if ! uname -a | grep void -i > /dev/null ; then	# "Void" is not found in the OS name.