diff options
| author | William Harrington <kb0iic@berzerkula.org> | 2021-04-02 13:40:26 -0500 |
|---|---|---|
| committer | William Harrington <kb0iic@berzerkula.org> | 2021-04-02 13:40:26 -0500 |
| commit | ae1c128bc8a0499702b104c082aa3b3db24e2b56 (patch) | |
| tree | 105e03cc67e990ae8e72b511087916a514b28274 | |
| parent | d15a78517dfa18948aaf9ae91b19cdc2de5df998 (diff) | |
| parent | 47b9901c403c85f3e4771babcb9f7380917d835b (diff) | |
Merge branch 'cleanup' into chapter7
| -rw-r--r-- | chapter6/backup.sh | 2 | ||||
| -rw-r--r-- | chapter6/cleanup.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chapter6/backup.sh b/chapter6/backup.sh index 73e3b3d..ed46f31 100644 --- a/chapter6/backup.sh +++ b/chapter6/backup.sh @@ -7,7 +7,7 @@ if [ -f "${LFS}/sources/chapter6/backup" ]; then 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}" diff --git a/chapter6/cleanup.sh b/chapter6/cleanup.sh index 29b133f..1a82633 100644 --- a/chapter6/cleanup.sh +++ b/chapter6/cleanup.sh @@ -1,10 +1,10 @@ #!/bin/bash if [ -f "${LFS}/sources/chapter6/cleanup" ]; then - echo -e " ${IGRN}Cleanup already performed${RST}" + printf "%b" " ${IGRN}Cleanup already performed${RST}" else - echo -ne "${GRN}Cleaning up ${YLW}${LFS}${RST}... " + printf "%b" "${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 @@ -18,6 +18,6 @@ else strip --strip-unneeded "${LFS}"/usr/sbin/* >/dev/null 2>&1 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/chapter6/cleanup >/dev/null 2>&1 fi |