Change message style

From "add" to "adding"

script/lib/confirmation.sh

@@ -11,7 +11,7 @@ function confirmation(){
 		***** ERROR : Confliction between ERASEALL and OVERWRITEINSTALL *****
 		...ERASEALL = ${ERASEALL}
 		...OVERWRITEINSTALL = ${OVERWRITEINSTALL}
-		...Check configuration in config.txt
+		...Check configuration in your config.sh
 
 		...Installation process terminated..
 		HEREDOC
@@ -23,7 +23,7 @@ function confirmation(){
 		cat <<- HEREDOC 1>&2
 		***** ERROR : VGNAME is "${VGNAME}" *****
 		..."-" is not allowed in the volume name. 
-		...Check configuration in config.txt
+		...Check configuration in your config.sh
 
 		...Installation process terminated..
 		HEREDOC
@@ -35,7 +35,7 @@ function confirmation(){
 		cat <<- HEREDOC 1>&2
 		***** ERROR : LVROOTNAME is "${LVROOTNAME}" *****
 		..."-" is not allowed in the volume name. 
-		...Check configuration in config.txt
+		...Check configuration in your config.sh
 
 		...Installation process terminated..
 		HEREDOC
@@ -47,19 +47,19 @@ function confirmation(){
 		cat <<- HEREDOC 1>&2
 		***** ERROR : LVSWAPNAME is "${LVSWAPNAME}" *****
 		..."-" is not allowed in the volume name. 
-		...Check configuration in config.txt
+		...Check configuration in your config.sh
 
 		...Installation process terminated..
 		HEREDOC
 		return 1 # with error status
 	fi # "-" is found in the volume name.
 
-	# For surre ask the config.sh is edited
+	# For surre ask the your config.sh is edited
 	cat <<- HEREDOC
 
 	The destination logical volume label is "${LVROOTNAME}"
 	"${LVROOTNAME}" uses ${LVROOTSIZE} of the LVM volume group.
-	Are you ready to install? [Y/N]
+	Are you sure to install? [Y/N]
 	HEREDOC
 	read YESNO
 	if [ ${YESNO} != "Y" -a ${YESNO} != "y" ] ; then
@@ -70,13 +70,13 @@ function confirmation(){
 		return 1 # with error status
 	fi	# if YES
 
-	# For sure ask ready to erase. 
+	# For sure ask to be sure 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 variable ERASEALL is ${ERASEALL}.
+		...Check your config.sh. The variable ERASEALL is ${ERASEALL}.
 
 		...Installation process terminated..
 		HEREDOC

script/lib/parainstall.sh

@@ -15,16 +15,16 @@ function parainstall() {
 		if ! ps $INSTALLER_PID  > /dev/null ; then	# If not exists
 			cat <<-HEREDOC 1>&2
 			***** ERROR : The GUI/TUI installer terminated unexpectedly. ***** 
-			...Delete the new logical volume "${VGNAME}-${LVROOTNAME}".
+			...Deleting the new logical volume "${VGNAME}-${LVROOTNAME}".
 			HEREDOC
 			lvremove -f /dev/mapper/${VGNAME}-${LVROOTNAME} 
-			echo "...Deactivate all logical volumes in volume group \"${VGNAME}\"."
+			echo "...Deactivating all logical volumes in volume group \"${VGNAME}\"."
 			vgchange -a n ${VGNAME}
-			echo "...Close LUKS volume \"${CRYPTPARTNAME}\"."
+			echo "...Closing LUKS volume \"${CRYPTPARTNAME}\"."
 			cryptsetup close  ${CRYPTPARTNAME}
 			cat <<-HEREDOC 1>&2
 
-			...The new logical volume is deleted. You can start Kaiten-yaki again. 
+			...The new logical volume has been deleted. You can retry Kaiten-yaki again. 
 			...Installation process terminated.
 			HEREDOC
 			return 1 # with error status
@@ -36,7 +36,7 @@ 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.
-	echo "...Add GRUB_ENABLE_CRYPTODISK entry to ${TARGETMOUNTPOINT}/etc/default/grub "
+	echo "...Adding 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

script/lib/preinstall.sh

@@ -12,45 +12,45 @@ function pre_install() {
 		# Assign specified space and rest of disk to the EFI and LUKS partition, respectively.
 		if [  ${ISEFI} -eq 1 ] ; then
 			# Zap existing partition table and create new GPT
-			echo "...Initialize ${DEV} with GPT."
+			echo "...Initializing ${DEV} with GPT."
 			sgdisk --zap-all "${DEV}"
 			# Create EFI partition and format it
-			echo "...Create an EFI partition on ${DEV}."
+			echo "...Creating an EFI partition on ${DEV}."
 			sgdisk --new=${EFIPARTITION}:0:+${EFISIZE} --change-name=${EFIPARTITION}:"EFI System"  --typecode=${EFIPARTITION}:ef00 "${DEV}"  
-			echo "...Format the EFI parttion."
+			echo "...Formatting the EFI parttion."
 			mkfs.vfat -F 32 -n EFI-SP "${DEV}${EFIPARTITION}"
 			# Create Linux partition
-			echo "...Create a Linux partition on ${DEV}."
+			echo "...Creating a Linux partition on ${DEV}."
 			sgdisk --new=${CRYPTPARTITION}:0:0    --change-name=${CRYPTPARTITION}:"Linux LUKS" --typecode=${CRYPTPARTITION}:8309 "${DEV}"
 			# Then print them
 			sgdisk --print "${DEV}"
 		else
 			# Zap existing partition table
-			echo "...Erase partition table of ${DEV}."
+			echo "...Erasing partition table of ${DEV}."
 			dd if=/dev/zero of=${DEV} bs=512 count=1
 			# Create MBR and allocate max storage for Linux partition
-			echo "...Create a Linux partition on ${DEV} with MBR."
+			echo "...Creating a Linux partition on ${DEV} with MBR."
 			sfdisk ${DEV} <<- HEREDOC
 			2M,,L
 			HEREDOC
 		fi	# if EFI firmware
 
 		# Encrypt the partition to install Linux
-		echo "...Initialize ${DEV}${CRYPTPARTITION} as crypt partition"
+		echo "...Initializing ${DEV}${CRYPTPARTITION} as crypt partition"
 		printf %s "${PASSPHRASE}" | cryptsetup luksFormat --type=luks1 --key-file - --batch-mode "${DEV}${CRYPTPARTITION}"
 
 	fi	# if erase all
 
 	# ----- Open the LUKS partition -----
 	# Open the crypt partition. 
-	echo "...Open a crypt partition ${DEV}${CRYPTPARTITION} as \"${CRYPTPARTNAME}\""
+	echo "...Opening a crypt partition ${DEV}${CRYPTPARTITION} as \"${CRYPTPARTNAME}\""
 	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 passphrase and config.txt
+		...Check passphrase and your config.txt
 
 		...Installation process terminated..
 		HEREDOC
@@ -61,12 +61,12 @@ function pre_install() {
 	# Check volume group ${VGNAME} exist or not
 	if  vgdisplay -s ${VGNAME} &> /dev/null ; then		# if exist
 		echo "...Volume group ${VGNAME} already exist. Skipped to create. No problem."
-		echo "...Activate all logical volumes in volume group ${VGNAME}."
+		echo "...Activating all logical volumes in volume group ${VGNAME}."
 		vgchange -ay
 	else
-		echo "...Initialize a physical volume on \"${CRYPTPARTNAME}\""
+		echo "...Initializing a physical volume on \"${CRYPTPARTNAME}\""
 		pvcreate /dev/mapper/${CRYPTPARTNAME}
-		echo "...And then create Volume group \"${VGNAME}\"."
+		echo "...And then creating Volume group \"${VGNAME}\"."
 		vgcreate ${VGNAME} /dev/mapper/${CRYPTPARTNAME}
 	fi # if /dev/volume-groupt exist
 
@@ -74,7 +74,7 @@ function pre_install() {
 	if [ -e /dev/mapper/${VGNAME}-${LVSWAPNAME} ] ; then 
 		echo "...Swap volume already exist. Skipped to create. No problem."
 	else
-		echo "...Create logical volume \"${LVSWAPNAME}\" on \"${VGNAME}\"."
+		echo "...Creating logical volume \"${LVSWAPNAME}\" on \"${VGNAME}\"."
 		lvcreate -L ${LVSWAPSIZE} -n ${LVSWAPNAME} ${VGNAME} 
 	fi	# if /dev/mapper/swap volume already exit. 
 
@@ -85,11 +85,11 @@ function pre_install() {
 		else	# exist and not overwriteinstall
 			cat <<- HEREDOC 1>&2
 			***** ERROR : Logical volume "${VGNAME}-${LVROOTNAME}" already exists. *****
-			...Check LVROOTNAME environment variable in config.txt.
+			...Check LVROOTNAME environment variable in your config.txt.
 			HEREDOC
-			echo "...Deactivate all logical volumes in volume group \"${VGNAME}\"."
+			echo "...Deactivating all logical volumes in volume group \"${VGNAME}\"."
 			vgchange -a n ${VGNAME}
-			echo "...Close LUKS volume \"${CRYPTPARTNAME}\"."
+			echo "...Closing LUKS volume \"${CRYPTPARTNAME}\"."
 			cryptsetup close  ${CRYPTPARTNAME}
 			cat <<- HEREDOC 1>&2
 
@@ -101,11 +101,11 @@ function pre_install() {
 		if [ ${OVERWRITEINSTALL} -eq 1 ] ; then
 			cat <<- HEREDOC 1>&2
 			***** ERROR : Logical volume "${VGNAME}-${LVROOTNAME}" doesn't exist while overwrite install. *****
-			...Check consistency of config.txt.
+			...Check consistency of your config.txt.
 			HEREDOC
 			echo "...Deactivate all logical volumes in volume group \"${VGNAME}\"."
 			vgchange -a n ${VGNAME}
-			echo "...Close LUKS volume \"${CRYPTPARTNAME}\"."
+			echo "...Closing LUKS volume \"${CRYPTPARTNAME}\"."
 			cryptsetup close  ${CRYPTPARTNAME}
 			cat <<- HEREDOC 1>&2
 
@@ -113,7 +113,7 @@ function pre_install() {
 			HEREDOC
 			return 1 # with error status
 		else # not exist and not overwrite install
-			echo "...Create logical volume \"${LVROOTNAME}\" on \"${VGNAME}\"."
+			echo "...Creating logical volume \"${LVROOTNAME}\" on \"${VGNAME}\"."
 			lvcreate -l ${LVROOTSIZE} -n ${LVROOTNAME} ${VGNAME}
 		fi
 	fi

script/ubuntu-kaiten-yaki.sh

@@ -94,11 +94,11 @@ function main() {
 
 	## Mount the target file system
 	# ${TARGETMOUNTPOINT} is created by the GUI/TUI installer
-	echo "...Mount /dev/mapper/${VGNAME}-${LVROOTNAME} on ${TARGETMOUNTPOINT}."
+	echo "...Mounting /dev/mapper/${VGNAME}-${LVROOTNAME} on ${TARGETMOUNTPOINT}."
 	mount /dev/mapper/${VGNAME}-${LVROOTNAME} ${TARGETMOUNTPOINT}
 
 	# And mount other directories
-	echo "...Mount all other dirs."
+	echo "...Mounting all other dirs."
 	for n in proc sys dev etc/resolv.conf; do mount --rbind "/$n" "${TARGETMOUNTPOINT}/$n"; done
 
 	# Change root and create the keyfile and ramfs image for Linux kernel. 
@@ -108,38 +108,38 @@ function main() {
 	mount -a
 
 	# Set up the kernel hook of encryption
-	echo "...Install cryptsetup-initramfs package."
+	echo "...Installing cryptsetup-initramfs package."
 	apt -qq install -y cryptsetup-initramfs
 
 	# Prepare a key file to embed in to the ramfs.
-	echo "...Prepair key file."
+	echo "...Prepairing key file."
 	mkdir /etc/luks
 	dd if=/dev/urandom of=/etc/luks/boot_os.keyfile bs=4096 count=1 status=none
 	chmod u=rx,go-rwx /etc/luks
 	chmod u=r,go-rwx /etc/luks/boot_os.keyfile
 
 	# Add a key to the key file. Use the passphrase in the environment variable. 
-	echo "...Add a key to the key file."
+	echo "...Adding a key to the key file."
 	printf %s "${PASSPHRASE}" | cryptsetup luksAddKey -d - "${DEV}${CRYPTPARTITION}" /etc/luks/boot_os.keyfile
 
 	# Add the LUKS volume information to /etc/crypttab to decrypt by kernel.  
-	echo "...Add LUKS volume info to /etc/crypttab."
+	echo "...Adding LUKS volume info to /etc/crypttab."
 	echo "${CRYPTPARTNAME} UUID=$(blkid -s UUID -o value ${DEV}${CRYPTPARTITION}) /etc/luks/boot_os.keyfile luks,discard" >> /etc/crypttab
 
 	# Putting key file into the ramfs initial image
-	echo "...Register key file to the ramfs"
+	echo "...Registering key file to the ramfs"
 	echo "KEYFILE_PATTERN=/etc/luks/*.keyfile" >> /etc/cryptsetup-initramfs/conf-hook
 	echo "UMASK=0077" >> /etc/initramfs-tools/initramfs.conf
 
 	# Finally, update the ramfs initial image with the key file. 
-	echo "...Upadte initramfs."
+	echo "...Upadting initramfs."
 	update-initramfs -uk all
 
 	# Leave chroot
 	HEREDOC
 
 	# Unmount all
-	echo "...Unmount all."
+	echo "...Unmounting all."
 	umount -R ${TARGETMOUNTPOINT}
 
 	# Finishing message

script/void-kaiten-yaki.sh

@@ -102,11 +102,11 @@ function main() {
 
 	## Mount the target file system
 	# ${TARGETMOUNTPOINT} is created by the GUI/TUI installer
-	echo "...Mount /dev/mapper/${VGNAME}-${LVROOTNAME} on ${TARGETMOUNTPOINT}."
+	echo "...Mounting /dev/mapper/${VGNAME}-${LVROOTNAME} on ${TARGETMOUNTPOINT}."
 	mount /dev/mapper/${VGNAME}-${LVROOTNAME} ${TARGETMOUNTPOINT}
 
 	# And mount other directories
-	echo "...Mount all other dirs."
+	echo "...Mounting all other dirs."
 	for n in proc sys dev etc/resolv.conf; do mount --rbind "/$n" "${TARGETMOUNTPOINT}/$n"; done
 
 	# Change root and create the keyfile and ramfs image for Linux kernel. 
@@ -116,30 +116,30 @@ function main() {
 	mount -a
 
 	# Set up the kernel hook of encryption
-	echo "...Install cryptsetup-initramfs package."
+	echo "...Installing cryptsetup-initramfs package."
 	xbps-install -y lvm2 cryptsetup
 
 	# Prepare a key file to embed in to the ramfs.
-	echo "...Prepair key file."
+	echo "...Prepairing key file."
 	mkdir /etc/luks
 	dd if=/dev/urandom of=/etc/luks/boot_os.keyfile bs=4096 count=1 status=none
 	chmod u=rx,go-rwx /etc/luks
 	chmod u=r,go-rwx /etc/luks/boot_os.keyfile
 
 	# Add a key to the key file. Use the passphrase in the environment variable. 
-	echo "...Add a key to the key file."
+	echo "...Adding a key to the key file."
 	printf %s "${PASSPHRASE}" | cryptsetup luksAddKey -d - "${DEV}${CRYPTPARTITION}" /etc/luks/boot_os.keyfile
 
 	# Add the LUKS volume information to /etc/crypttab to decrypt by kernel.  
-	echo "...Add LUKS volume info to /etc/crypttab."
+	echo "...Adding LUKS volume info to /etc/crypttab."
 	echo "${CRYPTPARTNAME} UUID=$(blkid -s UUID -o value ${DEV}${CRYPTPARTITION}) /etc/luks/boot_os.keyfile luks,discard" >> /etc/crypttab
 
 	# Putting key file into the ramfs initial image
-	echo "...Register key file to the ramfs"
+	echo "...Registering key file to the ramfs"
 	echo 'install_items+=" /etc/luks/boot_os.keyfile /etc/crypttab " ' > /etc/dracut.conf.d/10-crypt.conf
 
 	# Finally, update the ramfs initial image with the key file. 
-	echo "...Upadte initramfs."
+	echo "...Upadting initramfs."
 	xbps-reconfigure -fa
 	echo "...grub-mkconfig."
 	grub-mkconfig -o /boot/grub/grub.cfg
@@ -150,7 +150,7 @@ function main() {
 	HEREDOC
 
 	# Unmount all
-	echo "...Unmount all."
+	echo "...Unmounting all."
 	umount -R ${TARGETMOUNTPOINT}
 
 	# Finishing message