diff --git a/LFS/master.sh b/LFS/master.sh index 5e40811..200d4f8 100755 --- a/LFS/master.sh +++ b/LFS/master.sh @@ -146,6 +146,7 @@ chapter5_Makefiles() { chapter6_Makefiles() { #----------------------------# # Set envars and scripts for iteration targets + LOGS="" # Start with an empty global LOGS envar if [[ -z "$1" ]] ; then local N="" else @@ -198,10 +199,14 @@ chapter6_Makefiles() { esac fi - # First append each name of the script files to a list (this will become - # the names of the targets in the Makefile + # Append each name of the script files to a list (this will become + # the names of the targets in the Makefile) chapter6="$chapter6 ${this_script}${N}" + # Append each name of the script files to a list (this will become + # the names of the logs to be moved for each iteration) + LOGS="$LOGS ${this_script}" + #--------------------------------------------------------------------# # >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<< # #--------------------------------------------------------------------# @@ -337,7 +342,7 @@ build_Makefile() { chapter4_Makefiles chapter5_Makefiles chapter6_Makefiles - # Add the ICA/farce targets, if needed + # Add the iterations targets, if needed [[ "$COMPARE" != "0" ]] && wrt_compare_targets chapter789_Makefiles diff --git a/common/func_compare.sh b/common/func_compare.sh index 0123092..e4ff4f7 100644 --- a/common/func_compare.sh +++ b/common/func_compare.sh @@ -10,6 +10,7 @@ wrt_compare_targets() { # if [ "$N" != "1" ] ; then wrt_system_build "$N" "$PREV_IT" fi + this_script=$ITERATION wrt_target "$ITERATION" "$PREV" wrt_compare_work "$ITERATION" "$PREV_IT" wrt_logs "$N" @@ -108,7 +109,7 @@ wrt_logs() { # cat << EOF @pushd logs 1> /dev/null && \\ mkdir $ITERATION && \\ - cp ${chapter6} $ITERATION && \\ + mv ${LOGS} $ITERATION && \\ popd 1> /dev/null @touch \$@ EOF