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

Feature/get_log_path/ (#3064)

Browse Source 
* custom log path of debug/ via LOG_SUBPATH=
This commit is contained in:
lanefu
2021-07-27 07:24:06 -04:00
committed by GitHub
parent 02e0deb23d
commit 894cb29ca7
10 changed files with 106 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/configuration.sh
View File

@@ -168,7 +168,7 @@ desktop_element_available_for_arch() {
local arch_limitation_file="${1}/only_for"
echo "Checking if ${desktop_element_path} is available for ${targeted_arch} in ${arch_limitation_file}" >> "${DEST}"/debug/output.log
echo "Checking if ${desktop_element_path} is available for ${targeted_arch} in ${arch_limitation_file}" >> "${DEST}"/${LOG_SUBPATH}/output.log
if [[ -f "${arch_limitation_file}" ]]; then
grep -- "${targeted_arch}" "${arch_limitation_file}"
return $?
@@ -321,7 +321,7 @@ fi
# Write to variables :
# - aggregated_content
aggregate_content() {
LOG_OUTPUT_FILE="$SRC/output/debug/potential-paths.log"
LOG_OUTPUT_FILE="$SRC/output/${LOG_SUBPATH}/potential-paths.log"
echo -e "Potential paths :" >> "${LOG_OUTPUT_FILE}"
show_checklist_variables potential_paths
for filepath in ${potential_paths}; do
@@ -503,7 +503,7 @@ DEBOOTSTRAP_COMPONENTS="${DEBOOTSTRAP_COMPONENTS// /,}"
PACKAGE_LIST="$(one_line aggregate_all_cli "packages" " ")"
PACKAGE_LIST_ADDITIONAL="$(one_line aggregate_all_cli "packages.additional" " ")"
LOG_OUTPUT_FILE="$SRC/output/debug/debootstrap-list.log"
LOG_OUTPUT_FILE="$SRC/output/${LOG_SUBPATH}/debootstrap-list.log"
show_checklist_variables "DEBOOTSTRAP_LIST DEBOOTSTRAP_COMPONENTS PACKAGE_LIST PACKAGE_LIST_ADDITIONAL PACKAGE_LIST_UNINSTALL"
# Dependent desktop packages
@@ -610,7 +610,7 @@ if [[ -n $PACKAGE_LIST_RM ]]; then
fi
LOG_OUTPUT_FILE="$SRC/output/debug/debootstrap-list.log"
LOG_OUTPUT_FILE="$SRC/output/${LOG_SUBPATH}/debootstrap-list.log"
echo -e "\nVariables after manual configuration" >>$LOG_OUTPUT_FILE
show_checklist_variables "DEBOOTSTRAP_COMPONENTS DEBOOTSTRAP_LIST PACKAGE_LIST PACKAGE_MAIN_LIST"
unset LOG_OUTPUT_FILE
@@ -619,7 +619,7 @@ unset LOG_OUTPUT_FILE
[[ -z $NAMESERVER ]] && NAMESERVER="1.0.0.1" # default is cloudflare alternate
# debug
cat <<-EOF >> "${DEST}"/debug/output.log
cat <<-EOF >> "${DEST}"/${LOG_SUBPATH}/output.log
## BUILD SCRIPT ENVIRONMENT