From 48c0449eca92fdfb2ebb980fef779642effc28cd Mon Sep 17 00:00:00 2001 From: William Harrington Date: Wed, 24 Mar 2021 11:08:02 -0500 Subject: Add clean up script for chapter 7 --- chapter7/cleanup.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 chapter7/cleanup.sh (limited to 'chapter7/cleanup.sh') diff --git a/chapter7/cleanup.sh b/chapter7/cleanup.sh new file mode 100644 index 0000000..b300e7e --- /dev/null +++ b/chapter7/cleanup.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +if [ -f "${LFS}/sources/chapter7/cleanup" ]; then + echo -e "${YLW}Chapter 7 ${GRN}cleanup already performed.${RST}" +else + + echo -ne "${GRN}Cleaning up ${YLW}${LFS}${RST}... " + + sudo find "${LFS}"/usr/lib -name \*.la -delete >/dev/null 2>&1 + sudo find "${LFS}"/usr/libexec -name \*.la -delete >/dev/null 2>&1 + + sudo rm -rf "${LFS}"/usr/share/doc >/dev/null 2>&1 + sudo rm -rf "${LFS}"/usr/share/info >/dev/null 2>&1 + sudo rm -rf "${LFS}"/usr/share/man >/dev/null 2>&1 + + sudo strip --strip-debug "${LFS}"/usr/lib/* >/dev/null 2>&1 + sudo strip --strip-unneeded "${LFS}"/usr/bin/* >/dev/null 2>&1 + sudo strip --strip-unneeded "${LFS}"/usr/sbin/* >/dev/null 2>&1 + sudo strip --strip-unneeded "${LFS}"/tools/bin/* >/dev/null 2>&1 + + echo -e "${GRN}OK${RST}" + touch "${LFS}"/sources/chapter7/cleanup >/dev/null 2>&1 +fi -- cgit v1.2.3-54-g00ecf From 1624434cc39a74b36881aa657f4cea38b9bfba77 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Thu, 1 Apr 2021 16:21:00 -0500 Subject: Use intense colors for already completed message. --- chapter7/cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chapter7/cleanup.sh') diff --git a/chapter7/cleanup.sh b/chapter7/cleanup.sh index b300e7e..f4a8333 100644 --- a/chapter7/cleanup.sh +++ b/chapter7/cleanup.sh @@ -1,7 +1,7 @@ #!/bin/bash if [ -f "${LFS}/sources/chapter7/cleanup" ]; then - echo -e "${YLW}Chapter 7 ${GRN}cleanup already performed.${RST}" + echo -e " ${IYLW}Chapter 7 ${IGRN}cleanup already performed.${RST}" else echo -ne "${GRN}Cleaning up ${YLW}${LFS}${RST}... " -- cgit v1.2.3-54-g00ecf From d9af1744baa9db3b6c9c7eb9df057b965aa6e3ed Mon Sep 17 00:00:00 2001 From: William Harrington Date: Thu, 1 Apr 2021 17:17:00 -0500 Subject: Change cleanup and backup already performed messages. --- chapter7/backup.sh | 2 +- chapter7/cleanup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'chapter7/cleanup.sh') diff --git a/chapter7/backup.sh b/chapter7/backup.sh index 8b0944d..68b9824 100644 --- a/chapter7/backup.sh +++ b/chapter7/backup.sh @@ -4,7 +4,7 @@ file="${LFS_VER}-ch7-backup.tar.xz" directories=(bin dev etc lib lib64 proc run sbin sys tools usr var) if [ -f "${LFS}/sources/chapter7/backup" ]; then - echo -e " ${IYLW}Chapter 7 ${IGRN}Backup found. Remove manually to backup again.${RST}" + echo -e " ${IGRN}Backup found. Remove manually to backup again.${RST}" else echo -ne "${GRN}Backing up ${YLW}${LFS}${GRN} to ${YLW}${file}${RST}... " diff --git a/chapter7/cleanup.sh b/chapter7/cleanup.sh index f4a8333..95e1449 100644 --- a/chapter7/cleanup.sh +++ b/chapter7/cleanup.sh @@ -1,7 +1,7 @@ #!/bin/bash if [ -f "${LFS}/sources/chapter7/cleanup" ]; then - echo -e " ${IYLW}Chapter 7 ${IGRN}cleanup already performed.${RST}" + echo -e " ${IGRN}Cleanup already performed.${RST}" else echo -ne "${GRN}Cleaning up ${YLW}${LFS}${RST}... " -- cgit v1.2.3-54-g00ecf From eb35696e9b37f041ee4ddc606910abc5218fc9b4 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Fri, 2 Apr 2021 12:32:29 -0500 Subject: Format FAIL and OK messages with intense color. Reset colors before new line. Try to keep a sane style in the scripts. --- chapter7/backup.sh | 4 ++-- chapter7/cleanup.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'chapter7/cleanup.sh') diff --git a/chapter7/backup.sh b/chapter7/backup.sh index 68b9824..2aac08e 100644 --- a/chapter7/backup.sh +++ b/chapter7/backup.sh @@ -13,10 +13,10 @@ else spinner "$pid" "${SPINNER}" retval=$? if [ "${retval}" -ne 0 ]; then - echo -e "${RED}FAILED!${RST}" + echo -e "${IRED}FAILED!${RST}\n" exit "${retval}" else - echo -e "${GRN}OK${RST}" + echo -e "${IGRN}OK${RST}\n" fi popd > /dev/null || exit 1 diff --git a/chapter7/cleanup.sh b/chapter7/cleanup.sh index 95e1449..60a934f 100644 --- a/chapter7/cleanup.sh +++ b/chapter7/cleanup.sh @@ -18,6 +18,6 @@ else sudo strip --strip-unneeded "${LFS}"/usr/sbin/* >/dev/null 2>&1 sudo strip --strip-unneeded "${LFS}"/tools/bin/* >/dev/null 2>&1 - echo -e "${GRN}OK${RST}" + echo -e "${IGRN}OK${RST}\n" touch "${LFS}"/sources/chapter7/cleanup >/dev/null 2>&1 fi -- cgit v1.2.3-54-g00ecf From d15a78517dfa18948aaf9ae91b19cdc2de5df998 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Fri, 2 Apr 2021 13:36:51 -0500 Subject: Cleanup information messages for chapater 7 backup and cleanup and change from echo to printf. --- chapter7/backup.sh | 8 ++++---- chapter7/cleanup.sh | 6 +++--- lfs.sh | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'chapter7/cleanup.sh') diff --git a/chapter7/backup.sh b/chapter7/backup.sh index 2aac08e..a6abb86 100644 --- a/chapter7/backup.sh +++ b/chapter7/backup.sh @@ -4,19 +4,19 @@ file="${LFS_VER}-ch7-backup.tar.xz" directories=(bin dev etc lib lib64 proc run sbin sys tools usr var) if [ -f "${LFS}/sources/chapter7/backup" ]; then - echo -e " ${IGRN}Backup found. Remove manually to backup again.${RST}" + printf "%b" " ${IGRN}Backup previously completed${RST}\n" else - echo -ne "${GRN}Backing up ${YLW}${LFS}${GRN} to ${YLW}${file}${RST}... " + printf "%b" "${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}" "${directories[@]}" >/dev/null 2>&1 & pid=$! spinner "$pid" "${SPINNER}" retval=$? if [ "${retval}" -ne 0 ]; then - echo -e "${IRED}FAILED!${RST}\n" + printf "%b" "${IRED}FAILED!${RST}\n" exit "${retval}" else - echo -e "${IGRN}OK${RST}\n" + printf "%b" "${IGRN}OK${RST}\n" fi popd > /dev/null || exit 1 diff --git a/chapter7/cleanup.sh b/chapter7/cleanup.sh index 60a934f..0a5ec86 100644 --- a/chapter7/cleanup.sh +++ b/chapter7/cleanup.sh @@ -1,10 +1,10 @@ #!/bin/bash if [ -f "${LFS}/sources/chapter7/cleanup" ]; then - echo -e " ${IGRN}Cleanup already performed.${RST}" + printf "%b" " ${IGRN}Cleanup already performed${RST}\n" else - echo -ne "${GRN}Cleaning up ${YLW}${LFS}${RST}... " + printf "%b" "${GRN}Cleaning up ${YLW}${LFS}${RST}... " sudo find "${LFS}"/usr/lib -name \*.la -delete >/dev/null 2>&1 sudo find "${LFS}"/usr/libexec -name \*.la -delete >/dev/null 2>&1 @@ -18,6 +18,6 @@ else sudo strip --strip-unneeded "${LFS}"/usr/sbin/* >/dev/null 2>&1 sudo strip --strip-unneeded "${LFS}"/tools/bin/* >/dev/null 2>&1 - echo -e "${IGRN}OK${RST}\n" + printf "%b" "${IGRN}OK${RST}\n" touch "${LFS}"/sources/chapter7/cleanup >/dev/null 2>&1 fi diff --git a/lfs.sh b/lfs.sh index bdd8659..55bdfb6 100755 --- a/lfs.sh +++ b/lfs.sh @@ -169,7 +169,8 @@ if [[ "$retval" -eq 7 ]]; then sudo umount "${LFS}"/sys sudo umount "${LFS}"/proc - printf "%b" "\n${YLW}Chapter 7 ${GRN}cleanup and backup${RST}\n" + printf "%b" "\n${IWHT}======= ${IYLW}Chapter 7 ${IGRN}Cleanup and Backup \ +${IWHT}=======${RST}\n" source "${LFS}"/sources/chapter7/cleanup.sh source "${LFS}"/sources/chapter7/backup.sh else -- cgit v1.2.3-54-g00ecf