From ce949a547a4a108ca27562a891ef2e4e02999235 Mon Sep 17 00:00:00 2001
From: Suikan <26223147+suikan4github@users.noreply.github.com>
Date: Fri, 2 Jul 2021 07:20:28 +0900
Subject: [PATCH] forget to add

---
 script/common/parainstall.sh | 13 +++----------
 script/void-kaiten-yaki.sh   | 13 ++++---------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/script/common/parainstall.sh b/script/common/parainstall.sh
index 0324674..c45c483 100644
--- a/script/common/parainstall.sh
+++ b/script/common/parainstall.sh
@@ -27,19 +27,12 @@ function parainstall() {
 
 	# 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 [ ${PARAINSTMSG} -eq 1 ]; then
-		echo "...Add GRUB_ENABLE_CRYPTODISK entry to ${TARGETMOUNTPOINT}/etc/default/grub "
-	fi
+	echo "...Add GRUB_ENABLE_CRYPTODISK entry to ${TARGETMOUNTPOINT}/etc/default/grub "
 	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 [ ${PARAINSTMSG} -eq 1 ]; then
-		echo "...Waiting for the end of GUI/TUI installer."
-	fi
-	wait $installer_pid
+	echo "...Waiting for the end of GUI/TUI installer."
+	wait $INSTALLER_PID
 
 	# succesfull return
 	return 0
diff --git a/script/void-kaiten-yaki.sh b/script/void-kaiten-yaki.sh
index 50702e4..71e7011 100644
--- a/script/void-kaiten-yaki.sh
+++ b/script/void-kaiten-yaki.sh
@@ -13,8 +13,6 @@ function main() {
 
 	# This is the mount point of the install target. 
 	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.
@@ -50,8 +48,7 @@ function main() {
 	# ******************************************************************************* 
 
 	# Install essential packages.
-	xbps-install -y -Su xbps gptfdisk
-
+	xbps-install -y -Su xbps gptfdisk xterm
 
 	# Common part of the pre-install stage
 	if ! pre_install ; then
@@ -85,11 +82,9 @@ function main() {
 	# waitfor a console input
 	read dummy_var
 
-	# Start void-installer 
-	void-installer &
-	# Make it foreground
-	fg
-
+	# Start void-installer in the separate window
+	xterm -fa monospace -fs ${XTERMFONTSIZE} -e void-installer &
+	
 	# Record the PID of the installer. 
 	export INSTALLER_PID=$!