aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Harrington <kb0iic@berzerkula.org>2021-04-05 20:28:05 -0500
committerWilliam Harrington <kb0iic@berzerkula.org>2021-04-05 20:28:05 -0500
commit56dbd9d14e01fc4e4d4987a047f952ffa57f7777 (patch)
treec948160876b538781d5b1e6cbe7ba04a797268ef
parent0aa6a71f970f258691719ca986b84104d042d82c (diff)
Make tar command verbose and log to backup and cleanup logs.
-rw-r--r--chapter6/backup.sh22
-rw-r--r--chapter6/cleanup.sh23
-rw-r--r--chapter7/backup.sh2
-rw-r--r--chapter7/cleanup.sh23
4 files changed, 37 insertions, 33 deletions
diff --git a/chapter6/backup.sh b/chapter6/backup.sh
index ed46f31..15a26c9 100644
--- a/chapter6/backup.sh
+++ b/chapter6/backup.sh
@@ -9,17 +9,17 @@ else
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
- printf "%b" "${IRED}FAILED!${RST}\n"
- exit "${retval}"
- else
- sudo chown "${USER}" "${HOME}"/"${file}"
- printf "%b" "${IGRN}OK${RST}\n"
- fi
+ sudo XZ_OPTS="-T${NUMPROCS} -e" tar cJvpf "${HOME}"/"${file}" "${directories[@]}" >/"${LFS}"/sources/log/chapter6/backup.log 2>&1 & pid=$!
+ spinner "$pid" "${SPINNER}"
+ retval=$?
+ if [ "$retval" -ne 0 ]; then
+ printf "%b" "${IRED}FAILED!${RST}\n"
+ exit "${retval}"
+ else
+ sudo chown -v "${USER}" "${HOME}"/"${file}" >>"${LFS}"/sources/log/chapter6/backup.log
+ printf "%b" "${IGRN}OK${RST}\n"
+ fi
popd > /dev/null || exit 1
- touch "${LFS}/sources/chapter6/backup"
+ touch "${LFS}"/sources/chapter6/backup
fi
diff --git a/chapter6/cleanup.sh b/chapter6/cleanup.sh
index 2db4067..f0b9ce3 100644
--- a/chapter6/cleanup.sh
+++ b/chapter6/cleanup.sh
@@ -6,18 +6,21 @@ else
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
+ {
+ find "${LFS}"/usr/lib -name \*.la -delete
+ find "${LFS}"/usr/libexec -name \*.la -delete
- rm -rf "${LFS}"/usr/share/doc >/dev/null 2>&1
- rm -rf "${LFS}"/usr/share/info >/dev/null 2>&1
- rm -rf "${LFS}"/usr/share/man >/dev/null 2>&1
+ rm -rfv "${LFS}"/usr/share/doc
+ rm -rfv "${LFS}"/usr/share/info
+ rm -rfv "${LFS}"/usr/share/man
- strip --strip-debug "${LFS}"/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}"/usr/lib/*
+ strip --strip-unneeded "${LFS}"/usr/bin/*
+ strip --strip-unneeded "${LFS}"/usr/sbin/*
+ strip --strip-unneeded "${LFS}"/tools/bin/*
+
+} >"${LFS}"/sources/log/chapter6/cleanup.log 2>&1
printf "%b" "${IGRN}OK${RST}\n"
- touch "${LFS}"/sources/chapter6/cleanup >/dev/null 2>&1
+ touch "${LFS}"/sources/chapter6/cleanup
fi
diff --git a/chapter7/backup.sh b/chapter7/backup.sh
index a6abb86..7745551 100644
--- a/chapter7/backup.sh
+++ b/chapter7/backup.sh
@@ -9,7 +9,7 @@ else
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=$!
+ sudo XZ_OPTS="-T${NUMPROCS} -e" tar cJvpf "${HOME}"/"${file}" "${directories[@]}" >"${LFS}"/sources/log/chapter7/backup.log 2>&1 & pid=$!
spinner "$pid" "${SPINNER}"
retval=$?
if [ "${retval}" -ne 0 ]; then
diff --git a/chapter7/cleanup.sh b/chapter7/cleanup.sh
index 93e8a88..921981b 100644
--- a/chapter7/cleanup.sh
+++ b/chapter7/cleanup.sh
@@ -6,19 +6,20 @@ else
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
+ {
+ sudo find "${LFS}"/usr/lib -name \*.la -delete
+ sudo find "${LFS}"/usr/libexec -name \*.la -delete
- 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 rm -rfv "${LFS}"/usr/share/doc
+ sudo rm -rfv "${LFS}"/usr/share/info
+ sudo rm -rfv "${LFS}"/usr/share/man
- #find "${LFS}"/usr/lib -type f -executable -print | xargs sudo strip --strip-debug
- sudo strip --strip-debug "${LFS}"/usr/lib/* >/dev/null 2>&1 || true
- sudo strip --strip-unneeded "${LFS}"/usr/bin/* >/dev/null 2>&1 || true
- sudo strip --strip-unneeded "${LFS}"/usr/sbin/* >/dev/null 2>&1 || true
- sudo strip --strip-unneeded "${LFS}"/tools/bin/* >/dev/null 2>&1 || true
+ sudo strip --strip-debug "${LFS}"/usr/lib/* || true
+ sudo strip --strip-unneeded "${LFS}"/usr/bin/* || true
+ sudo strip --strip-unneeded "${LFS}"/usr/sbin/* || true
+ sudo strip --strip-unneeded "${LFS}"/tools/bin/* || true
+} >"${LFS}"/sources/log/chapter7/cleanup.log 2>&1
printf "%b" "${IGRN}OK${RST}\n"
- touch "${LFS}"/sources/chapter7/cleanup >/dev/null 2>&1
+ sudo touch "${LFS}"/sources/chapter7/cleanup >/dev/null 2>&1
fi