diff --git a/lib/functions/configuration/aggregation.sh b/lib/functions/configuration/aggregation.sh index 10d9437ab..753bc4843 100644 --- a/lib/functions/configuration/aggregation.sh +++ b/lib/functions/configuration/aggregation.sh @@ -6,8 +6,10 @@ # Write to variables : # - aggregated_content aggregate_content() { + display_alert "Aggregation: aggregate_content" "potential_paths: '${potential_paths}'" "aggregation" for filepath in ${potential_paths}; do if [[ -f "${filepath}" ]]; then + display_alert "Aggregation: aggregate_content" "HIT: '${filepath}'" "aggregation" aggregated_content+=$(cat "${filepath}") aggregated_content+="${separator}" fi @@ -15,6 +17,8 @@ aggregate_content() { } get_all_potential_paths() { + display_alert "Aggregation: get_all_potential_paths" "${*}" "aggregation" + local root_dirs="${AGGREGATION_SEARCH_ROOT_ABSOLUTE_DIRS}" local rel_dirs="${1}" local sub_dirs="${2}" @@ -49,6 +53,7 @@ get_all_potential_paths() { # (debootstrap, cli, desktop environments, desktop appgroups, ...) aggregate_all_root_rel_sub() { + display_alert "Aggregation: aggregate_all_root_rel_sub" "${*}" "aggregation" local separator="${2}" local potential_paths="" @@ -58,6 +63,7 @@ aggregate_all_root_rel_sub() { } aggregate_all_debootstrap() { + display_alert "Aggregation: aggregate_all_debootstrap" "${*}" "aggregation" local sub_dirs_to_check=". " if [[ ! -z "${SELECTED_CONFIGURATION+x}" ]]; then sub_dirs_to_check+="config_${SELECTED_CONFIGURATION}" @@ -66,6 +72,7 @@ aggregate_all_debootstrap() { } aggregate_all_cli() { + display_alert "Aggregation: aggregate_all_cli" "${*}" "aggregation" local sub_dirs_to_check=". " if [[ ! -z "${SELECTED_CONFIGURATION+x}" ]]; then sub_dirs_to_check+="config_${SELECTED_CONFIGURATION}" @@ -74,6 +81,7 @@ aggregate_all_cli() { } aggregate_all_desktop() { + display_alert "Aggregation: aggregate_all_desktop" "${*}" "aggregation" aggregate_all_root_rel_sub "${1}" "${2}" "${DESKTOP_ENVIRONMENTS_SEARCH_RELATIVE_DIRS}" "." aggregate_all_root_rel_sub "${1}" "${2}" "${DESKTOP_APPGROUPS_SEARCH_RELATIVE_DIRS}" "${DESKTOP_APPGROUPS_SELECTED}" } diff --git a/lib/functions/logging/logging.sh b/lib/functions/logging/logging.sh index 28389c7be..9dede6663 100644 --- a/lib/functions/logging/logging.sh +++ b/lib/functions/logging/logging.sh @@ -207,7 +207,7 @@ function display_alert() { if [[ "${SHOW_EXTENSIONS}" != "yes" ]]; then # enable to log a lot about extensions, hook methos, etc. skip_screen=1 fi - level_indicator="🎣" # fishing pole and "hook" + level_indicator="🎣" # fishing pole and "hook" inline_logs_color="\e[0;36m" # a dim cyan ;; @@ -227,6 +227,14 @@ function display_alert() { inline_logs_color="${tool_color}" # either gray or normal, a bit subdued. ;; + aggregation) + if [[ "${SHOW_AGGREGATION}" != "yes" ]]; then # aggregation (PACKAGE LISTS), very very verbose + skip_screen=1 + fi + level_indicator="📦" + inline_logs_color="\e[0;32m" + ;; + *) level="${level:-other}" # for file logging. level_indicator="🌿"