JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

armbian-next: logging: don't bomb due to lack of git or zstdmt

Browse Source 
- logging might run super early when dependencies are not installed
- or say in a container, without git
This commit is contained in:
Ricardo Pardini
2022-10-09 17:17:31 +02:00
parent 5e55c61bfc
commit 775cd6c619
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/functions/logging/logging.sh
View File

@@ -293,17 +293,26 @@ function export_ansi_logs() {
---------------------------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------------------------
# ARGs: ${ARMBIAN_ORIGINAL_ARGV[@]@Q} # ARGs: ${ARMBIAN_ORIGINAL_ARGV[@]@Q}
---------------------------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------------------------
# Last revision:
$(LC_ALL=C LANG=C git --git-dir="${SRC}/.git" log -1 --color --format=short --decorate)
----------------------------------------------------------------------------------------------------------------
# Git status:
$(LC_ALL=C LANG=C git -c color.status=always --work-tree="${SRC}" --git-dir="${SRC}/.git" status)
----------------------------------------------------------------------------------------------------------------
# Git changes:
$(LC_ALL=C LANG=C git --work-tree="${SRC}" --git-dir="${SRC}/.git" diff -u --color)
----------------------------------------------------------------------------------------------------------------
ANSI_HEADER ANSI_HEADER
if [[ -n "$(command -v git)" ]]; then
display_alert "Gathering git info for logs" "Processing git information, please wait..." "debug"
cat <<- GIT_ANSI_HEADER > "${target_file}"
----------------------------------------------------------------------------------------------------------------
# Last revision:
$(LC_ALL=C LANG=C git --git-dir="${SRC}/.git" log -1 --color --format=short --decorate)
----------------------------------------------------------------------------------------------------------------
# Git status:
$(LC_ALL=C LANG=C git -c color.status=always --work-tree="${SRC}" --git-dir="${SRC}/.git" status)
----------------------------------------------------------------------------------------------------------------
# Git changes:
$(LC_ALL=C LANG=C git --work-tree="${SRC}" --git-dir="${SRC}/.git" diff -u --color)
----------------------------------------------------------------------------------------------------------------
GIT_ANSI_HEADER
fi
display_alert "Preparing ANSI logs..." "Processing log files..." "debug"
# Find and sort the files there, store in array one per logfile # Find and sort the files there, store in array one per logfile
declare -a logfiles_array declare -a logfiles_array
mapfile -t logfiles_array < <(find "${LOGDIR}" -type f | LC_ALL=C sort -h) mapfile -t logfiles_array < <(find "${LOGDIR}" -type f | LC_ALL=C sort -h)
@@ -405,8 +414,14 @@ function trap_handler_cleanup_logging() {
old_logfile_fn="$(basename "${one_old_logfile}")" old_logfile_fn="$(basename "${one_old_logfile}")"
display_alert "Archiving old logfile" "${old_logfile_fn}" "debug" display_alert "Archiving old logfile" "${old_logfile_fn}" "debug"
mkdir -p "${target_archive_path}" mkdir -p "${target_archive_path}"
# shellcheck disable=SC2002 # my cat is not useless. a bit whiny. not useless.
zstdmt --quiet "${one_old_logfile}" -o "${target_archive_path}/${old_logfile_fn}.zst" # Check if we have `zstdmt` at this stage; if not, use standard gzip
if [[ -n "$(command -v zstdmt)" ]]; then
zstdmt --quiet "${one_old_logfile}" -o "${target_archive_path}/${old_logfile_fn}.zst"
else
# shellcheck disable=SC2002 # my cat is not useless. a bit whiny. not useless.
cat "${one_old_logfile}" | gzip > "${target_archive_path}/${old_logfile_fn}.gz"
fi
rm -f "${one_old_logfile}" rm -f "${one_old_logfile}"
done done
fi fi