From 415fa0f809c423bab891c3baa97c2be20b602577 Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Wed, 24 Mar 2021 09:46:25 -0500
Subject: Adjust indention.

---
 chapter6/backup.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/chapter6/backup.sh b/chapter6/backup.sh
index 6ffe768..0f77869 100644
--- a/chapter6/backup.sh
+++ b/chapter6/backup.sh
@@ -9,16 +9,16 @@ else
 
 	echo -ne "${GRN}Backing up ${YLW}${LFS}${GRN} to ${YLW}${FILE}${RST}... "
 	pushd "${LFS}" > /dev/null || exit 1
-	sudo XZ_OPTS="-T${NUMPROCS} -e" tar cJpf "${HOME}"/"${FILE}" "${DIRS[@]}" & pid=$!
-	  spinner "$pid"
-	  retval=$?
-	  if [ "$retval" -ne 0 ]; then
-		  echo -e "${RED}Backup FAILED!${RST}"
-		  exit 1
-	  else
-		  sudo chown "${USER}" /home/"${USER}"/"${FILE}"
-		  echo -e "${GRN}OK${RST}"
-	  fi
+		sudo XZ_OPTS="-T${NUMPROCS} -e" tar cJpf "${HOME}"/"${FILE}" "${DIRS[@]}" & pid=$!
+		spinner "$pid"
+		retval=$?
+		if [ "$retval" -ne 0 ]; then
+			echo -e "${RED}Backup FAILED!${RST}"
+			exit 1
+		else
+			sudo chown "${USER}" /home/"${USER}"/"${FILE}"
+			echo -e "${GRN}OK${RST}"
+		fi
 	popd > /dev/null || exit 1
 
 	touch "${LFS}/sources/chapter6/backup"
-- 
cgit v1.2.3-54-g00ecf


From 6b7897b097285d8c1f76ccdf2c49464eb9875a16 Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Wed, 24 Mar 2021 11:04:53 -0500
Subject: Adjust some text and use printf.

---
 chapter6/backup.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/chapter6/backup.sh b/chapter6/backup.sh
index 0f77869..842ed27 100644
--- a/chapter6/backup.sh
+++ b/chapter6/backup.sh
@@ -4,7 +4,7 @@ FILE="${LFS_VER}-ch6-backup.tar.xz"
 DIRS=(bin etc lib lib64 sbin tools usr var)
 
 if [ -f "${LFS}/sources/chapter6/backup" ]; then
-	echo -e "${GRN}Backup found. Remove manually to backup again.${RST}"
+	printf "%b" "${YLW}Chapter 6 ${GRN}Backup found. Remove manually to backup again.${RST}"
 else
 
 	echo -ne "${GRN}Backing up ${YLW}${LFS}${GRN} to ${YLW}${FILE}${RST}... "
@@ -13,11 +13,11 @@ else
 		spinner "$pid"
 		retval=$?
 		if [ "$retval" -ne 0 ]; then
-			echo -e "${RED}Backup FAILED!${RST}"
+			printf "%b" "${RED}Backup FAILED!${RST}\n"
 			exit 1
 		else
 			sudo chown "${USER}" /home/"${USER}"/"${FILE}"
-			echo -e "${GRN}OK${RST}"
+			printf "%b" "${GRN}OK${RST}\n"
 		fi
 	popd > /dev/null || exit 1
 
-- 
cgit v1.2.3-54-g00ecf


From 551537d4370bb373776b85d2a505e7dc59fd0f53 Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Wed, 24 Mar 2021 11:06:04 -0500
Subject: Extract virt fs mount commands to a separate script.

---
 mountvirtfs.sh   | 32 ++++++++++++++++++++++++++++++++
 preparechroot.sh | 36 +++++++-----------------------------
 2 files changed, 39 insertions(+), 29 deletions(-)
 create mode 100644 mountvirtfs.sh

diff --git a/mountvirtfs.sh b/mountvirtfs.sh
new file mode 100644
index 0000000..7eea548
--- /dev/null
+++ b/mountvirtfs.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+printf "%b" "${GRN}Mounting virtual kernel filesystems...${RST}\n"
+if ! mountpoint "${LFS}"/dev >/dev/null 2>&1; then
+	sudo mount -v --bind /dev "${LFS}"/dev
+else
+	printf "%b" "  ${YLW}${LFS}/dev${GRN} is already mounted${RST}\n"
+fi
+if ! mountpoint "${LFS}"/dev/pts >/dev/null 2>&1; then
+	sudo mount -v --bind /dev/pts "${LFS}"/dev/pts
+else
+	printf "%b" "  ${YLW}${LFS}/dev/pts${GRN} is already mounted${RST}\n"
+fi
+if ! mountpoint "${LFS}"/proc >/dev/null 2>&1; then
+	sudo mount -v --bind /proc "${LFS}"/proc
+else
+	printf "%b" "  ${YLW}${LFS}/proc${GRN} is already mounted${RST}\n"
+fi
+if ! mountpoint "${LFS}"/sys >/dev/null 2>&1; then
+	sudo mount -v --bind /sys "${LFS}"/sys
+else
+	printf "%b" "  ${YLW}${LFS}/sys${GRN} is already mounted${RST}\n"
+fi
+if ! mountpoint "${LFS}"/run >/dev/null 2>&1; then
+	sudo mount -v --bind /run "${LFS}"/run
+else
+	printf "%b" "  ${YLW}${LFS}/run${GRN} is already mounted${RST}\n"
+fi
+
+if [ -h "${LFS}"/dev/shm ]; then
+	sudo mkdir -pv "${LFS}"/"$(readlink "${LFS}"/dev/shm)"
+fi
diff --git a/preparechroot.sh b/preparechroot.sh
index b460175..1d05e72 100644
--- a/preparechroot.sh
+++ b/preparechroot.sh
@@ -4,6 +4,11 @@ source colors.sh
 
 export LFS="$1"
 
+if [ -f chrootprepared ]; then
+	printf "%b" "${RED}CHROOT ${GRN}already prepared...\n${RST}"
+	exit 0
+fi
+
 if [ -z "${LFS}" ]; then
 	printf "%b" "${RED}Require first argument as path to LFS build!${RST}\n"
 	exit 1
@@ -33,36 +38,9 @@ if [ "${USER}" == "root" ]; then
 	mknod -m 600 "${LFS}"/dev/console c 5 1 >/dev/null 2>&1
 	mknod -m 666 "${LFS}"/dev/null c 1 3 >/dev/null 2>&1
 	
-	printf "%b" "${GRN}Mounting virtual kernel filesystems...${RST}\n"
-	if ! mountpoint "${LFS}"/dev >/dev/null 2>&1; then
-		mount -v --bind /dev "${LFS}"/dev
-	else
-		printf "%b" "  ${YLW}${LFS}/dev${GRN} is already mounted${RST}\n"
-	fi
-	if ! mountpoint "${LFS}"/dev/pts >/dev/null 2>&1; then
-		mount -v --bind /dev/pts "${LFS}"/dev/pts
-	else
-		printf "%b" "  ${YLW}${LFS}/dev/pts${GRN} is already mounted${RST}\n"
-	fi
-	if ! mountpoint "${LFS}"/proc >/dev/null 2>&1; then
-		mount -v --bind /proc "${LFS}"/proc
-	else
-		printf "%b" "  ${YLW}${LFS}/proc${GRN} is already mounted${RST}\n"
-	fi
-	if ! mountpoint "${LFS}"/sys >/dev/null 2>&1; then
-		mount -v --bind /sys "${LFS}"/sys
-	else
-		printf "%b" "  ${YLW}${LFS}/sys${GRN} is already mounted${RST}\n"
-	fi
-	if ! mountpoint "${LFS}"/run >/dev/null 2>&1; then
-		mount -v --bind /run "${LFS}"/run
-	else
-		printf "%b" "  ${YLW}${LFS}/run${GRN} is already mounted${RST}\n"
-	fi
+	source mountvirtfs.sh
 
-	if [ -h "${LFS}"/dev/shm ]; then
-		mkdir -pv "${LFS}"/"$(readlink "${LFS}"/dev/shm)"
-	fi
+	touch chrootprepared
 
 else
 	printf "%b" "${RED}preparechroot.sh must be ran as ${YLW}root${RED} user!${RST}\n"
-- 
cgit v1.2.3-54-g00ecf


From e91f1d7aa947cbbe1c1605ed020d960220ba59b8 Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Wed, 24 Mar 2021 11:20:20 -0500
Subject: Use HOME variable when changing ownership of backup archive.

---
 chapter6/backup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chapter6/backup.sh b/chapter6/backup.sh
index 842ed27..c763d8c 100644
--- a/chapter6/backup.sh
+++ b/chapter6/backup.sh
@@ -16,7 +16,7 @@ else
 			printf "%b" "${RED}Backup FAILED!${RST}\n"
 			exit 1
 		else
-			sudo chown "${USER}" /home/"${USER}"/"${FILE}"
+			sudo chown "${USER}" "${HOME}"/"${FILE}"
 			printf "%b" "${GRN}OK${RST}\n"
 		fi
 	popd > /dev/null || exit 1
-- 
cgit v1.2.3-54-g00ecf


From fb719edbf7d47eedbe745352b90a8f69e2cb6dd9 Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Wed, 24 Mar 2021 11:28:18 -0500
Subject: Fix indentation.

---
 download.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/download.sh b/download.sh
index 9446d82..3726b84 100644
--- a/download.sh
+++ b/download.sh
@@ -26,7 +26,7 @@ cat packages.csv patches.csv | while read -r line; do
         printf "%b" "${PRP}Downloading ${YLW}${CACHEFILE}${RST}... "
 	#wget -nc ${URL} -O ${LFS}/sources/${CACHEFILE} --progress=dot -q --show-progress 2>&1 | awk 'NF>2 && $(NF-2) ~ /%/{printf "\r \t\t\t\t\t\t%s",$(NF-2)} END{print "\r    "}'
 	download "${URL}"
-	if ! echo "${MD5SUM} ${LFS}/sources/${CACHEFILE}" | md5sum -c > /dev/null 2>&1; then
+		if ! echo "${MD5SUM} ${LFS}/sources/${CACHEFILE}" | md5sum -c > /dev/null 2>&1; then
             rm -f "${LFS}/sources/${CACHEFILE}"
             printf "%b" "\n${GRN}Verification of ${YLW}${CACHEFILE} ${RED}failed! MD5 mismatch!${RST}\n"
             exit 1
-- 
cgit v1.2.3-54-g00ecf


From 75a9caa958cb26fa755b28cda777517fb17bae07 Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Wed, 24 Mar 2021 11:36:26 -0500
Subject: Adjust indention again.

---
 download.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/download.sh b/download.sh
index 3726b84..d816394 100644
--- a/download.sh
+++ b/download.sh
@@ -25,7 +25,7 @@ cat packages.csv patches.csv | while read -r line; do
 
         printf "%b" "${PRP}Downloading ${YLW}${CACHEFILE}${RST}... "
 	#wget -nc ${URL} -O ${LFS}/sources/${CACHEFILE} --progress=dot -q --show-progress 2>&1 | awk 'NF>2 && $(NF-2) ~ /%/{printf "\r \t\t\t\t\t\t%s",$(NF-2)} END{print "\r    "}'
-	download "${URL}"
+		download "${URL}"
 		if ! echo "${MD5SUM} ${LFS}/sources/${CACHEFILE}" | md5sum -c > /dev/null 2>&1; then
             rm -f "${LFS}/sources/${CACHEFILE}"
             printf "%b" "\n${GRN}Verification of ${YLW}${CACHEFILE} ${RED}failed! MD5 mismatch!${RST}\n"
-- 
cgit v1.2.3-54-g00ecf


From 68a82951d87dc542b4d6f14fb4e745b3154ccea5 Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Wed, 24 Mar 2021 13:04:40 -0500
Subject: Make Building message when first starting the build to have the
 target LFS location and target disk/partition as high intensity white.

---
 lfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lfs.sh b/lfs.sh
index c154c19..8a940c3 100755
--- a/lfs.sh
+++ b/lfs.sh
@@ -18,7 +18,7 @@ source spinner.sh
 #source versioncheck.sh
 
 printf "%b" "\n\n\n${CYN}BUILDING ${YLW}${LFS_VER} $(uname -m)${CYN} at \
-${PRP}${LFS}${CYN} on ${PRP}${LFS_DISK}${LFS_PART}${RST}\n\n\n"
+${IWHT}${LFS}${CYN} on ${IWHT}${LFS_DISK}${LFS_PART}${RST}\n\n\n"
 
 # Continue or Abort
 printf "%b" "${IGRN}CONTINUE ${IWHTB}(C)${RST} / ${IRED}ABORT ${IWHTB}(OTHER)${RST}\n"
-- 
cgit v1.2.3-54-g00ecf


From 7439ae410a0569cb2f309fd55ef5782381422455 Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Thu, 25 Mar 2021 11:01:29 -0500
Subject: Unset numjobs variable as it isn't used after using it in MAKEFLAGS.

---
 env.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/env.sh b/env.sh
index ab028e5..4e05c06 100644
--- a/env.sh
+++ b/env.sh
@@ -33,5 +33,7 @@ numjobs=$((NUMPROCS * 2 - 1))
 # Make flags for multiple jobs
 MAKEFLAGS="-j ${numjobs}"
 
+unset numjobs
+
 export PS1 LC_ALL LFS LFS_TGT PATH CONFIG_SITE
 export LFS_VER LFS_DISK LFS_PART LFS_PWD NUMPROCS MAKEFLAGS
-- 
cgit v1.2.3-54-g00ecf


From 8fbe40ea145e8303713785fbacd8c99ec0fa444c Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Thu, 25 Mar 2021 11:04:08 -0500
Subject: Unset variables no longer in use and remove commented out wget
 command.

---
 download.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/download.sh b/download.sh
index d816394..72b7bb3 100644
--- a/download.sh
+++ b/download.sh
@@ -24,7 +24,6 @@ cat packages.csv patches.csv | while read -r line; do
 
 
         printf "%b" "${PRP}Downloading ${YLW}${CACHEFILE}${RST}... "
-	#wget -nc ${URL} -O ${LFS}/sources/${CACHEFILE} --progress=dot -q --show-progress 2>&1 | awk 'NF>2 && $(NF-2) ~ /%/{printf "\r \t\t\t\t\t\t%s",$(NF-2)} END{print "\r    "}'
 		download "${URL}"
 		if ! echo "${MD5SUM} ${LFS}/sources/${CACHEFILE}" | md5sum -c > /dev/null 2>&1; then
             rm -f "${LFS}/sources/${CACHEFILE}"
@@ -33,3 +32,5 @@ cat packages.csv patches.csv | while read -r line; do
         fi
     fi
 done
+
+unset VERSION URL MD5SUM CACHEFILE
-- 
cgit v1.2.3-54-g00ecf


From 054c16f719b0df15bb63c908f03e20fab93bd405 Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Thu, 25 Mar 2021 11:05:57 -0500
Subject: Unset unused variables and remove commented out old way of getting
 DIRNAME.

---
 packageinstall.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packageinstall.sh b/packageinstall.sh
index c08710a..6dc7601 100644
--- a/packageinstall.sh
+++ b/packageinstall.sh
@@ -11,7 +11,6 @@ else
         VERSION="$(echo "$line" | cut -d\, -f2)"
         URL="$(echo "$line" | cut -d\, -f3 | sed "s/@/${VERSION}/g")"
         CACHEFILE="$(basename "${URL}")"
-        #DIRNAME="$(echo "${CACHEFILE}" | sed 's/\(.*\)\.tar\..*/\1/')"
 		DIRNAME="$(tar -tf "${CACHEFILE}" | sed -e 's@/.*@@' | uniq)"
 
 		# Remove existing if exists
@@ -49,3 +48,5 @@ else
 
     done
 fi
+
+unset VERSION URL CACHEFILE DIRNAME CHAPTER PACKAGE
-- 
cgit v1.2.3-54-g00ecf


From d4dde010b77c25609bf82e781d4b09150520639d Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Thu, 25 Mar 2021 11:08:11 -0500
Subject: Change case of PROC to lower case proc.

---
 spinner.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spinner.sh b/spinner.sh
index 5332ee1..74cb450 100644
--- a/spinner.sh
+++ b/spinner.sh
@@ -4,13 +4,13 @@
 #  string to display as second argument (default provided) and spins
 #  until the process completes.
 spinner() {
-    local PROC="$1"
+    local proc="$1"
     #local str="${2:-'Copyright of KatworX© Tech. Developed by Arjun Singh Kathait and Debugged by the ☆Stack Overflow Community☆'}"
 	local str=""
     local delay="0.1"
     tput civis  # hide cursor
     printf "%b" "${WHT}"
-    while [ -d /proc/"$PROC" ]; do
+    while [ -d /proc/"$proc" ]; do
         #-\|/
         #⠁⠂⠄⡀⢀⠠⠐⠈
         #▁▂▃▄▅▆▇█▇▆▅▄▃▂▁
@@ -38,7 +38,7 @@ spinner() {
         printf '\033[s\033[u[ ▂ ] %s\033[u' "$str"; sleep "$delay"
         printf '\033[s\033[u[ ▁ ] %s\033[u' "$str"; sleep "$delay"
     done
-    wait "${PROC}"
+    wait "${proc}"
     retval=$?
     printf '\033[s\033[u%*s\033[u\033[0m' $((${#str}+6)) " "  # return to normal
     tput cnorm  # restore cursor
-- 
cgit v1.2.3-54-g00ecf


From 9ecb12be2d5093c1cf95f2bb25358d75ac8ea37b Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Thu, 25 Mar 2021 11:10:36 -0500
Subject: Change case of FILE to file and rename DIRS to directories.

---
 chapter6/backup.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/chapter6/backup.sh b/chapter6/backup.sh
index c763d8c..99ddbe4 100644
--- a/chapter6/backup.sh
+++ b/chapter6/backup.sh
@@ -1,22 +1,22 @@
 #!/bin/bash
 
-FILE="${LFS_VER}-ch6-backup.tar.xz"
-DIRS=(bin etc lib lib64 sbin tools usr var)
+file="${LFS_VER}-ch6-backup.tar.xz"
+directories=(bin etc lib lib64 sbin tools usr var)
 
 if [ -f "${LFS}/sources/chapter6/backup" ]; then
 	printf "%b" "${YLW}Chapter 6 ${GRN}Backup found. Remove manually to backup again.${RST}"
 else
 
-	echo -ne "${GRN}Backing up ${YLW}${LFS}${GRN} to ${YLW}${FILE}${RST}... "
+	echo -ne "${GRN}Backing up ${YLW}${LFS}${GRN} to ${YLW}${file}${RST}... "
 	pushd "${LFS}" > /dev/null || exit 1
-		sudo XZ_OPTS="-T${NUMPROCS} -e" tar cJpf "${HOME}"/"${FILE}" "${DIRS[@]}" & pid=$!
+		sudo XZ_OPTS="-T${NUMPROCS} -e" tar cJpf "${HOME}"/"${file}" "${directories[@]}" & pid=$!
 		spinner "$pid"
 		retval=$?
 		if [ "$retval" -ne 0 ]; then
 			printf "%b" "${RED}Backup FAILED!${RST}\n"
 			exit 1
 		else
-			sudo chown "${USER}" "${HOME}"/"${FILE}"
+			sudo chown "${USER}" "${HOME}"/"${file}"
 			printf "%b" "${GRN}OK${RST}\n"
 		fi
 	popd > /dev/null || exit 1
-- 
cgit v1.2.3-54-g00ecf


From a3e171ba292cadb20809adb944dbfae41924dbeb Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Thu, 25 Mar 2021 11:11:09 -0500
Subject: Unset variables no longer used.

---
 chapter6/backup.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/chapter6/backup.sh b/chapter6/backup.sh
index 99ddbe4..f2f0d64 100644
--- a/chapter6/backup.sh
+++ b/chapter6/backup.sh
@@ -23,3 +23,5 @@ else
 
 	touch "${LFS}/sources/chapter6/backup"
 fi
+
+unset file directories
-- 
cgit v1.2.3-54-g00ecf


From 41b1fa5813a7e7dd1df52ea8a9afc5062dff9d7d Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Thu, 25 Mar 2021 11:12:37 -0500
Subject: Unset CFLAGS when done.

---
 chapter6/m4.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/chapter6/m4.sh b/chapter6/m4.sh
index 2f67ebe..6dc2c9a 100644
--- a/chapter6/m4.sh
+++ b/chapter6/m4.sh
@@ -12,3 +12,5 @@ sed '/^HELP2MAN/s/$/ --no-discard-stderr/' -i doc/Makefile.in
             --build="$(build-aux/config.guess)" &&
 make &&
 make DESTDIR="${LFS}" -j1 install
+
+unset CFLAGS
-- 
cgit v1.2.3-54-g00ecf