Merge branch 'master' into chapter7

33 files changed, 276 insertions, 219 deletions

diff --git a/chapter5/binutils.sh b/chapter5/binutils.sh
index c77a576..2d9da5b 100644
--- a/chapter5/binutils.sh
+++ b/chapter5/binutils.sh
@@ -1,9 +1,11 @@
+#!/bin/bash
+
 mkdir build
-cd build
+cd build || exit 1
 
-../configure --prefix=${LFS}/tools \
-             --with-sysroot=${LFS} \
-             --target=${LFS_TGT} \
+../configure --prefix="${LFS}"/tools \
+             --with-sysroot="${LFS}" \
+             --target="${LFS_TGT}" \
              --disable-nls \
              --disable-werror &&
 make &&
diff --git a/chapter5/gcc.sh b/chapter5/gcc.sh
index 6ef4ac6..ccc9630 100644
--- a/chapter5/gcc.sh
+++ b/chapter5/gcc.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 mkdir -p mpfr gmp mpc
 tar -xf ../mpfr-*.tar.xz -C mpfr --strip-components=1
 tar -xf ../gmp-*.tar.xz -C gmp --strip-components=1
@@ -11,13 +13,13 @@ case $(uname -m) in
 esac
 
 mkdir -v build
-cd build
+cd build || exit 1
 
 ../configure \
-    --target=${LFS_TGT} \
-    --prefix=${LFS}/tools \
+    --target="${LFS_TGT}" \
+    --prefix="${LFS}"/tools \
     --with-glibc-version=2.11 \
-    --with-sysroot=${LFS} \
+    --with-sysroot="${LFS}" \
     --with-newlib \
     --without-headers \
     --enable-initfini-array \
@@ -39,4 +41,4 @@ make -j1 install &&
 
 cd ..
 cat gcc/limitx.h gcc/glimits.h gcc/limity.h > \
-  `dirname $(${LFS_TGT}-gcc -print-libgcc-file-name)`/install-tools/include/limits.h
+	"$(dirname "$("${LFS_TGT}"-gcc -print-libgcc-file-name)")"install-tools/include/limits.h
diff --git a/chapter5/glibc.sh b/chapter5/glibc.sh
index 875e633..54db90a 100644
--- a/chapter5/glibc.sh
+++ b/chapter5/glibc.sh
@@ -1,31 +1,33 @@
+#!/bin/bash
+
 case $(uname -m) in
-    i?86)   ln -sfv ld-linux.so.2 ${LFS}/lib/ld-lsb.so.3
+    i?86)   ln -sfv ld-linux.so.2 "${LFS}"/lib/ld-lsb.so.3
     ;;
-    x86_64) ln -sfv ../lib/ld-linux-x86-64.so.2 ${LFS}/lib64
-            ln -sfv ../lib/ld-linux-x86-64.so.2 ${LFS}/lib64/ld-lsb-x86-64.so.3
+    x86_64) ln -sfv ../lib/ld-linux-x86-64.so.2 "${LFS}"/lib64
+            ln -sfv ../lib/ld-linux-x86-64.so.2 "${LFS}"/lib64/ld-lsb-x86-64.so.3
     ;;
 esac
 
 patch -Np1 -i ../glibc-2.33-fhs-1.patch &&
 
 mkdir -v build
-cd build
+cd build || exit 1
 
 ../configure \
       --prefix=/usr \
-      --host=${LFS_TGT} \
-      --build=$(../scripts/config.guess) \
+      --host="${LFS_TGT}" \
+      --build="$(../scripts/config.guess)" \
       --enable-kernel=4.10.0 \
-      --with-headers=${LFS}/usr/include \
+      --with-headers="${LFS}"/usr/include \
       libc_cv_slibdir=/lib &&
 
 make PARALLELMFLAGS="${MAKEFLAGS}" &&
-make DESTDIR=${LFS} install &&
+make DESTDIR="${LFS}" install &&
 
 echo 'int main(){}' > dummy.c &&
-${LFS_TGT}-gcc dummy.c &&
+"${LFS_TGT}"-gcc dummy.c &&
 readelf -l a.out | grep '/ld-linux' &&
 
 rm -v dummy.c a.out &&
 
-${LFS}/tools/libexec/gcc/${LFS_TGT}/10.2.0/install-tools/mkheaders
+"${LFS}"/tools/libexec/gcc/"${LFS_TGT}"/10.2.0/install-tools/mkheaders
diff --git a/chapter5/libstdc++.sh b/chapter5/libstdc++.sh
index 1e21f35..d1be7dd 100644
--- a/chapter5/libstdc++.sh
+++ b/chapter5/libstdc++.sh
@@ -1,14 +1,16 @@
+#!/bin/bash
+
 mkdir -v build
-cd build
+cd build || exit 1
 
 ../libstdc++-v3/configure \
-    --host=${LFS_TGT} \
-    --build=$(../config.guess) \
+    --host="${LFS_TGT}" \
+    --build="$(../config.guess)" \
     --prefix=/usr \
     --disable-multilib \
     --disable-nls \
     --disable-libstdcxx-pch \
-    --with-gxx-include-dir=/tools/${LFS_TGT}/include/c++/${VERSION} &&
+    --with-gxx-include-dir=/tools/"${LFS_TGT}"/include/c++/"${VERSION}" &&
 
 make &&
-make -j1 DESTDIR=${LFS} install
+make -j1 DESTDIR="${LFS}" install
diff --git a/chapter5/linux-api-headers.sh b/chapter5/linux-api-headers.sh
index 3de6e81..3111625 100644
--- a/chapter5/linux-api-headers.sh
+++ b/chapter5/linux-api-headers.sh
@@ -1,5 +1,7 @@
+#!/bin/bash
+
 make mrproper &&
 make headers &&
 find usr/include -name '.*' -delete &&
 rm usr/include/Makefile &&
-cp -rv usr/include ${LFS}/usr
+cp -rv usr/include "${LFS}"/usr
diff --git a/chapter6/backup.sh b/chapter6/backup.sh
index 92a176d..0f474d6 100644
--- a/chapter6/backup.sh
+++ b/chapter6/backup.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 FILE="${LFS_VER}-ch6-backup.tar.xz"
 DIRS="bin etc lib lib64 sbin tools usr var"
 
@@ -6,17 +8,17 @@ if [ -f "${LFS}/sources/chapter6/backup" ]; then
 else
 
 	echo -ne "${GRN}Backing up ${YLW}${LFS}${GRN} to ${YLW}${FILE}${RST}... "
-	pushd ${LFS} > /dev/null
-	  sudo XZ_OPTS="${NUMPROCS} -e" tar -cJpf /home/${USER}/${FILE} ${DIRS} & pid=$!
-	  spinner "$!"
+	pushd "${LFS}" > /dev/null || exit 1
+	  sudo XZ_OPTS="${NUMPROCS} -e" tar -cJpf /home/"${USER}"/"${FILE}" "${DIRS}" & pid=$!
+	  spinner "$pid"
 	  retval=$?
 	  if [ "$retval" -ne 0 ]; then
 		  echo -e "${RED}Backup FAILED!${RST}"
 	  else
-		  sudo chown ${USER} /home/${USER}/${FILE}
+		  sudo chown "${USER}" /home/"${USER}"/"${FILE}"
 		  echo -e "${GRN}OK${RST}"
 	  fi
-	popd > /dev/null
+	popd > /dev/null || exit 1
 
 	touch "${LFS}/sources/chapter6/backup"
 fi
diff --git a/chapter6/bash.sh b/chapter6/bash.sh
index 83a7a89..ae7bb34 100644
--- a/chapter6/bash.sh
+++ b/chapter6/bash.sh
@@ -1,8 +1,10 @@
+#!/bin/bash
+
 ./configure --prefix=/usr \
-            --build=$(support/config.guess) \
-            --host=${LFS_TGT} \
+            --build="$(support/config.guess)" \
+            --host="${LFS_TGT}" \
             --without-bash-malloc &&
 make &&
-make DESTDIR=${LFS} -j1 install &&
-mv ${LFS}/usr/bin/bash ${LFS}/bin/bash &&
-ln -sv bash ${LFS}/bin/sh
+make DESTDIR="${LFS}" -j1 install &&
+mv "${LFS}"/usr/bin/bash "${LFS}"/bin/bash &&
+ln -sv bash "${LFS}"/bin/sh
diff --git a/chapter6/binutils.sh b/chapter6/binutils.sh
index 5411f57..9b97c4b 100644
--- a/chapter6/binutils.sh
+++ b/chapter6/binutils.sh
@@ -1,14 +1,16 @@
+#!/bin/bash
+
 mkdir -v build
-cd build
+cd build || exit 1
 
 ../configure \
     --prefix=/usr \
-    --build=$(../config.guess) \
-    --host=${LFS_TGT} \
+    --build="$(../config.guess)" \
+    --host="${LFS_TGT}" \
     --disable-nls \
     --enable-shared \
     --disable-werror \
     --enable-64-bit-bfd &&
 make &&
-make DESTDIR=${LFS} -j1 install &&
-install -vm755 libctf/.libs/libctf.so.0.0.0 ${LFS}/usr/lib
+make DESTDIR="${LFS}" -j1 install &&
+install -vm755 libctf/.libs/libctf.so.0.0.0 "${LFS}"/usr/lib
diff --git a/chapter6/cleanup.sh b/chapter6/cleanup.sh
index a457f0d..abe4b0a 100644
--- a/chapter6/cleanup.sh
+++ b/chapter6/cleanup.sh
@@ -1,21 +1,23 @@
+#!/bin/bash
+
 if [ -f "${LFS}/sources/chapter6/cleanup" ]; then
 	echo -e "${YLW}Chapter 6 ${GRN}cleanup already performed.${RST}"
 else
 
 	echo -ne "${GRN}Cleaning up ${YLW}${LFS}${RST}... "
 
-	find ${LFS}/usr/lib -name \*.la -delete >/dev/null 2>&1
-	find ${LFS}/usr/libexec -name \*.la -delete >/dev/null 2>&1
+	find "${LFS}"/usr/lib -name \*.la -delete >/dev/null 2>&1
+	find "${LFS}"/usr/libexec -name \*.la -delete >/dev/null 2>&1
 
 	rm -rf /usr/share/doc >/dev/null 2>&1
 	rm -rf /usr/share/info >/dev/null 2>&1
 	rm -rf /usr/share/man >/dev/null 2>&1
 
-	strip --strip-debug ${LFS}S/usr/lib/* >/dev/null 2>&1
-	strip --strip-unneeded ${LFS}/usr/bin/* >/dev/null 2>&1
-	strip --strip-unneeded ${LFS}/usr/sbin/* >/dev/null 2>&1
-	strip --strip-unneeded ${LFS}/tools/bin/* >/dev/null 2>&1
+	strip --strip-debug "${LFS}"S/usr/lib/* >/dev/null 2>&1
+	strip --strip-unneeded "${LFS}"/usr/bin/* >/dev/null 2>&1
+	strip --strip-unneeded "${LFS}"/usr/sbin/* >/dev/null 2>&1
+	strip --strip-unneeded "${LFS}"/tools/bin/* >/dev/null 2>&1
 
 	echo -e "${GRN}OK${RST}"
-	touch ${LFS}/sources/chapter6/cleanup >/dev/null 2>&1
+	touch "${LFS}"/sources/chapter6/cleanup >/dev/null 2>&1
 fi
diff --git a/chapter6/coreutils.sh b/chapter6/coreutils.sh
index b9d5079..536fa52 100644
--- a/chapter6/coreutils.sh
+++ b/chapter6/coreutils.sh
@@ -1,15 +1,17 @@
+#!/bin/bash
+
 ./configure --prefix=/usr \
-            --host=${LFS_TGT} \
-            --build=$(build-aux/config.guess) \
+            --host="${LFS_TGT}" \
+            --build="$(build-aux/config.guess)" \
             --enable-install-program=hostname \
             --enable-no-install-program=kill,uptime &&
 make &&
-make DESTDIR=${LFS} -j1 install &&
-mv -v ${LFS}/usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} ${LFS}/bin &&
-mv -v ${LFS}/usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,rm}        ${LFS}/bin &&
-mv -v ${LFS}/usr/bin/{rmdir,stty,sync,true,uname}               ${LFS}/bin &&
-mv -v ${LFS}/usr/bin/{head,nice,sleep,touch}                    ${LFS}/bin &&
-mv -v ${LFS}/usr/bin/chroot                                     ${LFS}/usr/sbin &&
-mkdir -pv ${LFS}/usr/share/man/man8 &&
-mv -v ${LFS}/usr/share/man/man1/chroot.1 ${LFS}/usr/share/man/man8/chroot.8 &&
-sed -i 's/"1"/"8"/' ${LFS}/usr/share/man/man8/chroot.8
+make DESTDIR="${LFS}" -j1 install &&
+mv -v "${LFS}"/usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} "${LFS}"/bin &&
+mv -v "${LFS}"/usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,rm}        "${LFS}"/bin &&
+mv -v "${LFS}"/usr/bin/{rmdir,stty,sync,true,uname}               "${LFS}"/bin &&
+mv -v "${LFS}"/usr/bin/{head,nice,sleep,touch}                    "${LFS}"/bin &&
+mv -v "${LFS}"/usr/bin/chroot                                     "${LFS}"/usr/sbin &&
+mkdir -pv "${LFS}"/usr/share/man/man8 &&
+mv -v "${LFS}"/usr/share/man/man1/chroot.1 "${LFS}"/usr/share/man/man8/chroot.8 &&
+sed -i 's/"1"/"8"/' "${LFS}"/usr/share/man/man8/chroot.8
diff --git a/chapter6/diffutils.sh b/chapter6/diffutils.sh
index 1e20581..f6c45af 100644
--- a/chapter6/diffutils.sh
+++ b/chapter6/diffutils.sh
@@ -1,4 +1,7 @@
+#!/bin/bash
+
 sed 's/help2man -i/help2man --no-discard-stderr -i /' -i man/Makefile.in
-HELP2MAN="help2man --no-discard-stderr" ./configure --prefix=/usr --host=${LFS_TGT} &&
+HELP2MAN="help2man --no-discard-stderr" ./configure --prefix=/usr \
+	--host="${LFS_TGT}" &&
 make &&
-make DESTDIR=${LFS} -j1 install
+make DESTDIR="${LFS}" -j1 install
diff --git a/chapter6/file.sh b/chapter6/file.sh
index e2697a9..5323924 100644
--- a/chapter6/file.sh
+++ b/chapter6/file.sh
@@ -1,13 +1,17 @@
+#!/bin/bash
+
 mkdir build
-pushd build > /dev/null
+pushd build > /dev/null || exit 1
 
     ../configure --disable-bzlib \
                --disable-libseccomp \
                --disable-xzlib \
                --disable-zlib &&
     make &&
-popd > /dev/null
+popd > /dev/null || exit 1
 
-./configure --prefix=/usr --host=${LFS_TGT} --build=$(./config.guess) &&
-make FILE_COMPILE=$(pwd)/build/src/file &&
-make DESTDIR=${LFS} -j1 install
+./configure --prefix=/usr \
+			--host="${LFS_TGT}" \
+			--build="$(./config.guess)" &&
+make FILE_COMPILE="$(pwd)/build/src/file" &&
+make DESTDIR="${LFS}" -j1 install
diff --git a/chapter6/findutils.sh b/chapter6/findutils.sh
index b587638..9d53587 100644
--- a/chapter6/findutils.sh
+++ b/chapter6/findutils.sh
@@ -1,8 +1,10 @@
+#!/bin/bash
+
 ./configure --prefix=/usr \
-            --host=${LFS_TGT} \
-            --build=$(build-aux/config.guess) &&
+            --host="${LFS_TGT}" \
+            --build="$(build-aux/config.guess)" &&
 make &&
-make DESTDIR=${LFS} -j1 install &&
+make DESTDIR="${LFS}" -j1 install &&
 
-mv -v ${LFS}/usr/bin/find ${LFS}/bin &&
-sed -i 's|find:=${BINDIR}|find:=/bin|' ${LFS}/usr/bin/updatedb
+mv -v "${LFS}"/usr/bin/find "${LFS}"/bin &&
+sed -i 's|find:=${BINDIR}|find:=/bin|' "${LFS}"/usr/bin/updatedb
diff --git a/chapter6/gawk.sh b/chapter6/gawk.sh
index 5d2fd68..29d7a8b 100644
--- a/chapter6/gawk.sh
+++ b/chapter6/gawk.sh
@@ -1,6 +1,8 @@
+#!/bin/bash
+
 sed -i 's/extras//' Makefile.in &&
 ./configure --prefix=/usr \
-            --host=${LFS_TGT} \
-            --build=$(./config.guess) &&
+            --host="${LFS_TGT}" \
+            --build="$(./config.guess)" &&
 make &&
-make DESTDIR=${LFS} -j1 install
+make DESTDIR="${LFS}" -j1 install
diff --git a/chapter6/gcc.sh b/chapter6/gcc.sh
index adf4593..881d200 100644
--- a/chapter6/gcc.sh
+++ b/chapter6/gcc.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 mkdir -p isl mpfr gmp mpc
 tar -xf ../isl-*.tar.xz  -C isl --strip-components=1
 tar -xf ../mpfr-*.tar.xz -C mpfr --strip-components=1
@@ -11,16 +13,16 @@ case $(uname -m) in
 esac
 
 mkdir -v build
-cd build
+cd build || exit 1
 
-mkdir -pv ${LFS_TGT}/libgcc &&
-ln -s ../../../libgcc/gthr-posix.h ${LFS_TGT}/libgcc/gthr-default.h &&
+mkdir -pv "${LFS_TGT}"/libgcc &&
+ln -s ../../../libgcc/gthr-posix.h "${LFS_TGT}"/libgcc/gthr-default.h &&
 ../configure \
-    --build=$(../config.guess) \
-    --host=${LFS_TGT} \
+    --build="$(../config.guess)" \
+    --host="${LFS_TGT}" \
     --prefix=/usr \
-    CC_FOR_TARGET=${LFS_TGT}-gcc \
-    --with-build-sysroot=${LFS} \
+    CC_FOR_TARGET="${LFS_TGT}"-gcc \
+    --with-build-sysroot="${LFS}" \
     --enable-initfini-array \
     --disable-nls \
     --disable-multilib \
@@ -33,5 +35,5 @@ ln -s ../../../libgcc/gthr-posix.h ${LFS_TGT}/libgcc/gthr-default.h &&
     --disable-libstdcxx \
     --enable-languages=c,c++ &&
 make &&
-make DESTDIR=${LFS} -j1 install &&
-ln -sv gcc ${LFS}/usr/bin/cc
+make DESTDIR="${LFS}" -j1 install &&
+ln -sv gcc "${LFS}"/usr/bin/cc
diff --git a/chapter6/grep.sh b/chapter6/grep.sh
index a768e19..9aab0f4 100644
--- a/chapter6/grep.sh
+++ b/chapter6/grep.sh
@@ -1,5 +1,7 @@
+#!/bin/bash
+
 ./configure --prefix=/usr \
-            --host=${LFS_TGT} \
+            --host="${LFS_TGT}" \
             --bindir=/bin &&
 make &&
-make DESTDIR=${LFS} -j1 install
+make DESTDIR="${LFS}" -j1 install
diff --git a/chapter6/gzip.sh b/chapter6/gzip.sh
index 853ed7b..f894df6 100644
--- a/chapter6/gzip.sh
+++ b/chapter6/gzip.sh
@@ -1,4 +1,7 @@
-./configure --prefix=/usr --host=${LFS_TGT} &&
+#!/bin/bash
+
+./configure --prefix=/usr \
+			--host="${LFS_TGT}" &&
 make &&
-make DESTDIR=${LFS} -j1 install &&
-mv -v ${LFS}/usr/bin/gzip ${LFS}/bin
+make DESTDIR="${LFS}" -j1 install &&
+mv -v "${LFS}"/usr/bin/gzip "${LFS}"/bin
diff --git a/chapter6/m4.sh b/chapter6/m4.sh
index 04ffbcc..2f67ebe 100644
--- a/chapter6/m4.sh
+++ b/chapter6/m4.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c &&
 echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h &&
 
@@ -6,7 +8,7 @@ export CFLAGS="-Wabi=11 -fpermissive"
 sed '/^HELP2MAN/s/$/ --no-discard-stderr/' -i doc/Makefile.in
 
 ./configure --prefix=/usr \
-            --host=${LFS_TGT} \
-            --build=$(build-aux/config.guess) &&
+            --host="${LFS_TGT}" \
+            --build="$(build-aux/config.guess)" &&
 make &&
-make DESTDIR=${LFS} -j1 install
+make DESTDIR="${LFS}" -j1 install
diff --git a/chapter6/make.sh b/chapter6/make.sh
index 69c7e72..4de06b6 100644
--- a/chapter6/make.sh
+++ b/chapter6/make.sh
@@ -1,6 +1,8 @@
+#!/bin/bash
+
 ./configure --prefix=/usr \
             --without-guile \
-            --host=${LFS_TGT} \
-            --build=$(build-aux/config.guess)
+            --host="${LFS_TGT}" \
+            --build="$(build-aux/config.guess)" &&
 make &&
-make DESTDIR=${LFS} -j1 install
+make DESTDIR="${LFS}" -j1 install
diff --git a/chapter6/ncurses.sh b/chapter6/ncurses.sh
index 91ffa45..6320a9f 100644
--- a/chapter6/ncurses.sh
+++ b/chapter6/ncurses.sh
@@ -1,15 +1,17 @@
+#!/bin/bash
+
 sed -i s/mawk// configure &&
 
 mkdir build
-pushd build > /dev/null
+pushd build > /dev/null || exit 1
     ../configure &&
     make -C include &&
     make -C progs tic &&
-popd > /dev/null
+popd > /dev/null || exit 1
 
 ./configure --prefix=/usr \
-            --host=${LFS_TGT} \
-            --build=$(./config.guess) \
+            --host="${LFS_TGT}" \
+            --build="$(./config.guess)" \
             --mandir=/usr/share/man \
             --with-manpage-format=normal \
             --with-shared \
@@ -18,7 +20,7 @@ popd > /dev/null
             --without-normal \
             --enable-widec &&
 make &&
-make DESTDIR=${LFS} TIC_PATH=$(pwd)/build/progs/tic -j1 install &&
-echo "INPUT(-lncursesw)" > ${LFS}/usr/lib/libncurses.so &&
-mv -v ${LFS}/usr/lib/libncursesw.so.6* ${LFS}/lib &&
-ln -sfv ../../lib/$(readlink ${LFS}/usr/lib/libncursesw.so) ${LFS}/usr/lib/libncursesw.so
+make DESTDIR="${LFS}" TIC_PATH="$(pwd)"/build/progs/tic -j1 install &&
+echo "INPUT(-lncursesw)" > "${LFS}"/usr/lib/libncurses.so &&
+mv -v "${LFS}"/usr/lib/libncursesw.so.6* "${LFS}"/lib &&
+ln -sfv ../../lib/"$(readlink "${LFS}"/usr/lib/libncursesw.so)" "${LFS}"/usr/lib/libncursesw.so
diff --git a/chapter6/patch.sh b/chapter6/patch.sh
index 55e45aa..fa1dac9 100644
--- a/chapter6/patch.sh
+++ b/chapter6/patch.sh
@@ -1,5 +1,7 @@
+#!/bin/bash
+
 ./configure --prefix=/usr \
-            --host=${LFS_TGT} \
-            --build=$(build-aux/config.guess) &&
+            --host="${LFS_TGT}" \
+            --build="$(build-aux/config.guess)" &&
 make &&
-make DESTDIR=${LFS} -j1 install
+make DESTDIR="${LFS}" -j1 install
diff --git a/chapter6/sed.sh b/chapter6/sed.sh
index a768e19..9aab0f4 100644
--- a/chapter6/sed.sh
+++ b/chapter6/sed.sh
@@ -1,5 +1,7 @@
+#!/bin/bash
+
 ./configure --prefix=/usr \
-            --host=${LFS_TGT} \
+            --host="${LFS_TGT}" \
             --bindir=/bin &&
 make &&
-make DESTDIR=${LFS} -j1 install
+make DESTDIR="${LFS}" -j1 install
diff --git a/chapter6/tar.sh b/chapter6/tar.sh
index 1c32e33..730d108 100644
--- a/chapter6/tar.sh
+++ b/chapter6/tar.sh
@@ -1,6 +1,8 @@
+#!/bin/bash
+
 ./configure --prefix=/usr \
-            --host=${LFS_TGT} \
-            --build=$(build-aux/config.guess) \
+            --host="${LFS_TGT}" \
+            --build="$(build-aux/config.guess)" \
             --bindir=/bin &&
 make &&
-make DESTDIR=${LFS} -j1 install
+make DESTDIR="${LFS}" -j1 install
diff --git a/chapter6/xz.sh b/chapter6/xz.sh
index 7515350..12a43ce 100644
--- a/chapter6/xz.sh
+++ b/chapter6/xz.sh
@@ -1,10 +1,12 @@
+#!/bin/bash
+
 ./configure --prefix=/usr \
-            --host=${LFS_TGT} \
-            --build=$(build-aux/config.guess) \
+            --host="${LFS_TGT}" \
+            --build="$(build-aux/config.guess)" \
             --disable-static \
             --docdir=/usr/share/doc/xz-5.2.5 &&
 make &&
-make DESTDIR=${LFS} -j1 install
-mv -v ${LFS}/usr/bin/{lzma,unlzma,lzcat,xz,unxz,xzcat}  ${LFS}/bin &&
-mv -v ${LFS}/usr/lib/liblzma.so.*                       ${LFS}/lib &&
-ln -svf ../../lib/$(readlink ${LFS}/usr/lib/liblzma.so) ${LFS}/usr/lib/liblzma.so
+make DESTDIR="${LFS}" -j1 install
+mv -v "${LFS}"/usr/bin/{lzma,unlzma,lzcat,xz,unxz,xzcat}  "${LFS}"/bin &&
+mv -v "${LFS}"/usr/lib/liblzma.so.*                       "${LFS}"/lib &&
+ln -svf ../../lib/"$(readlink "${LFS}"/usr/lib/liblzma.so)" "${LFS}"/usr/lib/liblzma.so
diff --git a/colors.sh b/colors.sh
index 6ecef32..0e48ab9 100644
--- a/colors.sh
+++ b/colors.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Normal colors
 BLK="\e[0;30m"
 RED="\e[0;31m"
diff --git a/download.sh b/download.sh
index 4154c75..179990d 100644
--- a/download.sh
+++ b/download.sh
@@ -1,21 +1,23 @@
-# Packages
+#!/bin/bash
+
+# Downlod Packages and Patches
 
 download()
 {
     tput civis
     local url=$1
     echo -n "    "
-    wget -nc -q --show-progress --progress=dot $url 2>&1 | grep --line-buffered "%" | \
+    wget -nc -q --show-progress --progress=dot "$url" 2>&1 | grep --line-buffered "%" | \
         sed -u -e "s,\.,,g" | awk '{printf("\b\b\b\b%4s", $2)}'
     echo -ne "\b\b\b\b\n"
     tput cnorm
 }
 
-cat packages.csv patches.csv | while read line; do
-    NAME="$(echo $line | cut -d\, -f1)"
-    VERSION="$(echo $line | cut -d\, -f2)"
-    URL="$(echo $line | cut -d\, -f3 | sed "s/@/${VERSION}/g")"
-    MD5SUM="$(echo $line | cut -d\, -f4)"
+cat packages.csv patches.csv | while read -r line; do
+    #NAME="$(echo "$line" | cut -d\, -f1)"
+    VERSION="$(echo "$line" | cut -d\, -f2)"
+    URL="$(echo "$line" | cut -d\, -f3 | sed "s/@/${VERSION}/g")"
+    MD5SUM="$(echo "$line" | cut -d\, -f4)"
     CACHEFILE="$(basename "${URL}")"
 
     if [ ! -f "${CACHEFILE}" ]; then
@@ -23,7 +25,7 @@ cat packages.csv patches.csv | while read line; do
 
         echo -ne "${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}"
             echo -e "\n${GRN}Verification of ${YLW}${CACHEFILE} ${RED}failed! MD5 mismatch!${RST}"
diff --git a/env.sh b/env.sh
index 273da6c..45a5ca4 100644
--- a/env.sh
+++ b/env.sh
@@ -1,32 +1,38 @@
+#!/bin/bash
+
 # Begin book environment settings
-export PS1='\u:\w\$ '
+
+PS1='\u:\w\$ '
 set +h
 umask 022
 
-export LFS=/mnt/lfs
-export LC_ALL=POSIX
-export LFS_TGT=$(uname -m)-lfs-linux-gnu
+LFS=/mnt/lfs
+LC_ALL=POSIX
+LFS_TGT=$(uname -m)-lfs-linux-gnu
 PATH=/usr/bin
 if [ ! -L /bin ]; then PATH=/bin:${PATH}; fi
-export PATH=${LFS}/tools/bin:${PATH}
-export CONFIG_SITE=${LFS}/usr/share/config.site
+PATH=${LFS}/tools/bin:${PATH}
+CONFIG_SITE=${LFS}/usr/share/config.site
 # End book environment settings
 
 # LFS Version being built
-export LFS_VER=LFS_10_1
+LFS_VER=LFS_10_1
 
 # Disk where LFS partition will exist / or exists
-export LFS_DISK=/dev/sdb
+LFS_DISK=/dev/sdb
 
 # Partition number where LFS will exist / or exists
-export LFS_PART=1
+LFS_PART=1
 
 # LFS User password (not used at this time)
-export LFS_PWD=lfs
+LFS_PWD=lfs
 
 # Get number of online processors
-export NUMPROCS=$(getconf _NPROCESSORS_ONLN)
-numjobs=$(expr ${NUMPROCS} \* 2 - 1)
-
+NUMPROCS=$(getconf _NPROCESSORS_ONLN)
+numjobs=$((NUMPROCS * 2 - 1))
+echo $numjobs
 # Make flags for multiple jobs
-export MAKEFLAGS="-j ${numjobs}"
+MAKEFLAGS="-j ${numjobs}"
+
+export PS1 LC_ALL LFS LFS_TGT PATH CONFIG_SITE
+export LFS_VER LFS_DISK LFS_PART LFS_PWD NUMPROCS MAKEFLAGS
diff --git a/lfs.sh b/lfs.sh
index a129f76..db1c2dd 100755
--- a/lfs.sh
+++ b/lfs.sh
@@ -22,8 +22,7 @@ ${PRP}${LFS}${CYN} on ${PRP}${LFS_DISK}${LFS_PART}${RST}\n\n\n"
 
 # Continue or Abort
 echo -e "${IGRN}CONTINUE ${IWHTB}(C)${RST} / ${IRED}ABORT ${IWHTB}(OTHER)${RST}"
-read -n 1 contabort
-if [ $? == 0 ]; then
+if read -r -n 1 contabort; then
 	if [ "$contabort" == "C" ] || [ "$contabort" == "c" ]; then
 		echo -e "\b${IWHT}Build is  ${IGRN}CONTINUING${RST}"
 	else	
@@ -37,31 +36,32 @@ fi
 
 echo -e "${GRN}Creating LFS directory at ${YLW}${LFS}${GRN} if it does not exist...${RST}"
 # Create LFS directory if it doesn't exist
-[[ -d /mnt/lfs ]] || sudo mkdir ${LFS}
+[[ -d /mnt/lfs ]] || sudo mkdir "${LFS}"
 
-echo -e "${GRN}Setting up partition on ${YLW}${LFS_DISK} ${GRN}\
-with ${YLW}ext4${GRN} filesystem at ${YLW}${LFS_DISK}${LFS_ROOT} ${GRN}\
-and mounting at ${YLW}${LFS}${RST}..."
 # Setup partition, filesystem, format and mount if
 # LFS filesystem is not previously mounted
 if ! grep -q "${LFS}" /proc/mounts; then
+	echo -e "${GRN}Setting up partition on ${YLW}${LFS_DISK} ${GRN}\
+with ${YLW}ext4${GRN} filesystem at ${YLW}${LFS_DISK}${LFS_ROOT} ${GRN}\
+and mounting at ${YLW}${LFS}${RST}..."
+
     source setupdisk.sh "${LFS_DISK}" "${LFS_PART}"
     sudo mount "${LFS_DISK}${LFS_PART}" "${LFS}"
-    sudo chown -v ${USER} "${LFS}"
+    sudo chown -v "${USER}" "${LFS}"
 fi
 
 # Create limited directory layout
-mkdir -p ${LFS}/sources
-mkdir -p ${LFS}/tools
-mkdir -p ${LFS}/bin
-mkdir -p ${LFS}/etc
-mkdir -p ${LFS}/lib
-mkdir -p ${LFS}/sbin
-mkdir -p ${LFS}/usr
-mkdir -p ${LFS}/var
+mkdir -p "${LFS}"/sources
+mkdir -p "${LFS}"/tools
+mkdir -p "${LFS}"/bin
+mkdir -p "${LFS}"/etc
+mkdir -p "${LFS}"/lib
+mkdir -p "${LFS}"/sbin
+mkdir -p "${LFS}"/usr
+mkdir -p "${LFS}"/var
 
 case $(uname -m) in
-    x86_64) mkdir -p ${LFS}/lib64 ;;
+    x86_64) mkdir -p "${LFS}"/lib64 ;;
 esac
 
 # Will use normal user and not special lfs user
@@ -71,8 +71,8 @@ esac
 #echo -e "${LFS_PWD}\n${LFS_PWD}\n" | sudo passwd lfs
 
 # Copy scripts and csv files to LFS sources target
-cp -rf *.sh chapter* *.csv "${LFS}/sources"
-cd "${LFS}/sources"
+cp -rf ./*.sh chapter* ./*.csv "${LFS}/sources"
+cd "${LFS}/sources" || exit 1
 
 # Download packages and patches
 source download.sh
@@ -105,15 +105,15 @@ done
 chmod ugo+x preparechroot.sh
 chmod ugo+x insidechroot.sh
 echo -e "${CYN}PREPARING CHROOT ENVIRONMENT...${RST}"
-sudo ./preparechroot.sh ${LFS}
+sudo ./preparechroot.sh "${LFS}"
 echo -e "${CYN}ENTERING CHROOT ENVIRONMENT...${RST}"
 sleep 3
 
 sudo chroot "${LFS}" /usr/bin/env \
 	HOME=/root \
-	TERM=${TERM} \
+	TERM="${TERM}" \
 	PS1='(lfs chroot) \u:\w\$ ' \
 	PATH=/bin:/usr/bin:/sbin:/usr/sbin \
-	NUMPROCS=${NUMPROCS} \
+	NUMPROCS="${NUMPROCS}" \
 	MAKEFLAGS="${MAKEFLAGS}" \
 	/bin/bash --login +h -c "/sources/insidechroot.sh"
diff --git a/packageinstall.sh b/packageinstall.sh
index 3e899a1..a890ded 100644
--- a/packageinstall.sh
+++ b/packageinstall.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 CHAPTER="$1"
 PACKAGE="$2"
 
@@ -5,19 +7,18 @@ if [ -f "${LFS}/sources/chapter${CHAPTER}/${PACKAGE}" ]; then
     echo -e "${GRN}Package ${YLW}${PACKAGE} ${GRN}already built and installed for ${YLW}Chapter ${CHAPTER}.${RST}"
 
 else
-    grep -i "^${PACKAGE}" packages.csv | grep -i -v "\.patch;" | while read line; do
-        VERSION="$(echo $line | cut -d\, -f2)"
-        URL="$(echo $line | cut -d\, -f3 | sed "s/@/${VERSION}/g")"
+    grep -i "^${PACKAGE}" packages.csv | grep -i -v "\.patch;" | while read -r line; do
+        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="$(echo "${CACHEFILE}" | sed 's/\(.*\)\.tar\..*/\1/')"
+		DIRNAME="$(tar -tf "${CACHEFILE}" | sed -e 's@/.*@@' | uniq)"
 
-        if [ -d "${DIRNAME}" ]; then
-            rm -rf ${DIRNAME}
-        fi
-        mkdir -p "${DIRNAME}"
+		# Remove existing if exists
+        rm -rf "${DIRNAME}"
 
         echo -ne "${IBLU}Extracting ${YLW}${CACHEFILE}... "
-        tar xf "${CACHEFILE}" -C "${DIRNAME}" >/dev/null 2>&1 & pid=$!
+		tar xf "${CACHEFILE}" > /dev/null 2>&1 & pid=$!
         spinner "$pid"
 		retval=$?
 		if [ "$retval" -ne 0 ]; then
@@ -25,31 +26,26 @@ else
 			return $retval
 		fi
 
-        #TOPLEVELDIR = "tar -tf ${CACHEFILE} | sed -e 's@/.*@@' | uniq"
-
-        pushd "${DIRNAME}" > /dev/null
-            if [ "$(ls -1A | wc -l)" == "1" ]; then
-				find */ -mindepth 1 -maxdepth 1 -exec mv -t ./ -- {} +
-            fi
+        pushd "${DIRNAME}" > /dev/null || return 1
 
             echo -ne "\n${CYN}Compiling ${YLW}${PACKAGE}${RST}... "
             sleep 5
 
-            mkdir -p "../log/chapter${CHAPTER}/"
-            source "../chapter${CHAPTER}/${PACKAGE}.sh" 2>&1 > "../log/chapter${CHAPTER}/${PACKAGE}.log" 2>&1 & pid=$!
+            mkdir -p "${LFS}/sources/log/chapter${CHAPTER}/"
+            source "${LFS}/sources/chapter${CHAPTER}/${PACKAGE}.sh" 2>&1 > "${LFS}/sources/log/chapter${CHAPTER}/${PACKAGE}.log" 2>&1 & pid=$!
             spinner "$pid"
             retval=$?
             if [ "$retval" -ne 0 ]; then
                 echo -e "\n${GRN}Compiling ${YLW}${PACKAGE} ${RED}FAILED!${RST}"
-                popd > /dev/null
+                popd > /dev/null || return 1
                 return $retval
             else
                 echo -e "\n${GRN}Done Compiling ${YLW}${PACKAGE}${RST}"
-                touch ${LFS}/sources/chapter${CHAPTER}/${PACKAGE}
-                rm -rf ${LFS}/sources/${DIRNAME}
+                touch "${LFS}"/sources/chapter"${CHAPTER}"/"${PACKAGE}"
+                rm -rf "${LFS}"/sources/"${DIRNAME}"
             fi
 
-        popd > /dev/null
+        popd > /dev/null || return 1
 
     done
 fi
diff --git a/preparechroot.sh b/preparechroot.sh
index 07b3cb3..302fd9b 100644
--- a/preparechroot.sh
+++ b/preparechroot.sh
@@ -11,63 +11,57 @@ fi
 
 if [ "${USER}" == "root" ]; then
 	echo -e "${GRN}Changing ownership to root...${RST}"
-	chown -R root:root ${LFS}/bin
-	chown -R root:root ${LFS}/etc
-	chown -R root:root ${LFS}/lib
-	chown -R root:root ${LFS}/sbin
-	chown -R root:root ${LFS}/tools
-	chown -R root:root ${LFS}/usr
-	chown -R root:root ${LFS}/var
+	chown -R root:root "${LFS}"/bin
+	chown -R root:root "${LFS}"/etc
+	chown -R root:root "${LFS}"/lib
+	chown -R root:root "${LFS}"/sbin
+	chown -R root:root "${LFS}"/tools
+	chown -R root:root "${LFS}"/usr
+	chown -R root:root "${LFS}"/var
 
 	case $(uname -m) in
-		x86_64) chown -R root:root ${LFS}/lib64 ;;
+		x86_64) chown -R root:root "${LFS}"/lib64 ;;
 	esac
 
 	echo -e "${GRN}Creating virtual kernel filesystem mountpoints...${RST}"
-	mkdir -p ${LFS}/dev
-	mkdir -p ${LFS}/proc
-	mkdir -p ${LFS}/run
-	mkdir -p ${LFS}/sys
+	mkdir -p "${LFS}"/dev
+	mkdir -p "${LFS}"/proc
+	mkdir -p "${LFS}"/run
+	mkdir -p "${LFS}"/sys
 	
 	echo -e "${GRN}Creating initial device nodes...${RST}"
-	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
+	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
 	
 	echo -e "${GRN}Mounting virtual kernel filesystems...${RST}"
-	mountpoint ${LFS}/dev >/dev/null 2>&1
-	retval=$?
-	if [ "$retval" -ne 0 ]; then
-		mount -v --bind /dev ${LFS}/dev
+	if ! mountpoint "${LFS}"/dev >/dev/null 2>&1; then
+		mount -v --bind /dev "${LFS}"/dev
 	else
 		echo -e "  ${YLW}${LFS}/dev${GRN} is already mounted${RST}"
 	fi
-	mountpoint ${LFS}/dev/pts >/dev/null 2>&1
-	if [ "$?" -ne 0 ]; then
-		mount -v --bind /dev/pts ${LFS}/dev/pts
+	if ! mountpoint "${LFS}"/dev/pts >/dev/null 2>&1; then
+		mount -v --bind /dev/pts "${LFS}"/dev/pts
 	else
 		echo -e "  ${YLW}${LFS}/dev/pts${GRN} is already mounted${RST}"
 	fi
-	mountpoint ${LFS}/proc >/dev/null 2>&1
-	if [ "$?" -ne 0 ]; then
-		mount -v --bind /proc ${LFS}/proc
+	if ! mountpoint "${LFS}"/proc >/dev/null 2>&1; then
+		mount -v --bind /proc "${LFS}"/proc
 	else
 		echo -e "  ${YLW}${LFS}/proc${GRN} is already mounted${RST}"
 	fi
-	mountpoint ${LFS}/sys >/dev/null 2>&1
-	if [ "$?" -ne 0 ]; then
-		mount -v --bind /sys ${LFS}/sys
+	if ! mountpoint "${LFS}"/sys >/dev/null 2>&1; then
+		mount -v --bind /sys "${LFS}"/sys
 	else
 		echo -e "  ${YLW}${LFS}/sys${GRN} is already mounted${RST}"
 	fi
-	mountpoint ${LFS}/run >/dev/null 2>&1
-	if [ "$?" -ne 0 ]; then
-		mount -v --bind /run ${LFS}/run
+	if ! mountpoint "${LFS}"/run >/dev/null 2>&1; then
+		mount -v --bind /run "${LFS}"/run
 	else
 		echo -e "  ${YLW}${LFS}/run${GRN} is already mounted${RST}"
 	fi
 
-	if [ -h ${LFS}/dev/shm ]; then
-		mkdir -pv ${LFS}/$(readlink ${LFS}/dev/shm)
+	if [ -h "${LFS}"/dev/shm ]; then
+		mkdir -pv "${LFS}"/"$(readlink "${LFS}"/dev/shm)"
 	fi
 
 else
diff --git a/setupdisk.sh b/setupdisk.sh
index 2cdad5b..216388f 100644
--- a/setupdisk.sh
+++ b/setupdisk.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 LFS_DISK="$1"
 LFS_ROOT="$2"
 
diff --git a/spinner.sh b/spinner.sh
index 91b9649..83fc536 100644
--- a/spinner.sh
+++ b/spinner.sh
@@ -1,13 +1,16 @@
+#!/bin/bash
+
 ## spinner takes the pid of the process as the first argument and
 #  string to display as second argument (default provided) and spins
 #  until the process completes.
 spinner() {
     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 "${WHT}"
-    while [ -d /proc/$PROC ]; do
+    echo -ne "${WHT}"
+    while [ -d /proc/"$PROC" ]; do
         #-\|/
         #⠁⠂⠄⡀⢀⠠⠐⠈
         #▁▂▃▄▅▆▇█▇▆▅▄▃▂▁
@@ -35,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
diff --git a/versioncheck.sh b/versioncheck.sh
index ed1caa7..27c113b 100755
--- a/versioncheck.sh
+++ b/versioncheck.sh
@@ -5,7 +5,7 @@ export LC_ALL=C
 bash --version | head -n1 | cut -d" " -f2-4
 MYSH=$(readlink -f /bin/sh)
 echo "/bin/sh -> $MYSH"
-echo $MYSH | grep -q bash || echo "ERROR: /bin/sh does not point to bash"
+echo "$MYSH" | grep -q bash || echo "ERROR: /bin/sh does not point to bash"
 unset MYSH
 
 echo -n "Binutils: "
@@ -15,7 +15,7 @@ bison --version | head -n1
 if [ -h /usr/bin/yacc ]; then
     echo "/usr/bin/yacc -> $(readlink -f /usr/bin/yacc)"
 elif [ -x /usr/bin/yacc ]; then
-    echo yacc is $(/usr/bin/yacc --version | head -n1)
+    echo yacc is "$(/usr/bin/yacc --version | head -n1)"
 else
     echo "yacc not found"
 fi
@@ -30,7 +30,7 @@ gawk --version | head -n1
 if [ -h /usr/bin/awk ]; then
     echo "/usr/bin/awk -> $(readlink -f /usr/bin/awk)"
 elif [ -x /usr/bin/awk ]; then
-    echo awk is $(/usr/bin/awk --version | head -n1)
+    echo awk is "$(/usr/bin/awk --version | head -n1)"
 else
     echo "awk not found"
 fi
@@ -44,7 +44,7 @@ cat /proc/version
 m4 --version | head -n1
 make --version | head -n1
 patch --version | head -n1
-echo Perl $(perl -V:version)
+echo Perl "$(perl -V:version)"
 python3 --version
 sed --version | head -n1
 tar --version | head -n1
@@ -55,4 +55,4 @@ echo 'int main(){}' >dummy.c && g++ -o dummy dummy.c
 if [ -x dummy ]; then
     echo "g++ compilation OK"
 else echo "g++ compilation failed"; fi
-rm -f dummy.c dummy
\ No newline at end of file
+rm -f dummy.c dummy