Changeset c57747d

Timestamp:

06/29/2017 04:45:31 PM (7 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

45f8a9c8

Parents:

a4acb12

Message:

Make the date of the SBU_DU file the same as the one reported at the end of
the jhalfs run. Note that date is the one when the run is started

Files:

• CLFS/master.sh (modified) (1 diff)
• CLFS2/master.sh (modified) (1 diff)
• CLFS3/master.sh (modified) (1 diff)
• HLFS/master.sh (modified) (1 diff)
• LFS/master.sh (modified) (1 diff)
• common/create-sbu_du-report.sh (modified) (4 diffs)

CLFS/master.sh

@@ -1122 +1122 @@
         @\$(call echo_message, Building)
         @if [ "\$(ADD_REPORT)" = "y" ]; then \\
-          ./create-sbu_du-report.sh logs $VERSION; \\
+          ./create-sbu_du-report.sh logs $VERSION $(date --iso-8601); \\
           \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
         fi;

CLFS2/master.sh

@@ -503 +503 @@
         @\$(call echo_message, Building)
         @if [ "\$(ADD_REPORT)" = "y" ]; then \\
-          ./create-sbu_du-report.sh logs $VERSION; \\
+          ./create-sbu_du-report.sh logs $VERSION $(date --iso-8601); \\
           \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
         fi;

CLFS3/master.sh

@@ -552 +552 @@
         @\$(call echo_message, Building)
         @if [ "\$(ADD_REPORT)" = "y" ]; then \\
-          ./create-sbu_du-report.sh logs $VERSION; \\
+          ./create-sbu_du-report.sh logs $VERSION $(date --iso-8601); \\
           \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
         fi;

HLFS/master.sh

@@ -617 +617 @@
         @\$(call echo_message, Building)
         @if [ "\$(ADD_REPORT)" = "y" ]; then \\
-          ./create-sbu_du-report.sh logs $VERSION; \\
+          ./create-sbu_du-report.sh logs $VERSION $(date --iso-8601); \\
           \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
         fi;

LFS/master.sh

@@ -575 +575 @@
         @\$(call echo_message, Building)
         @if [ "\$(ADD_REPORT)" = "y" ]; then \\
-          sudo ./create-sbu_du-report.sh logs $VERSION; \\
+          sudo ./create-sbu_du-report.sh logs $VERSION $(date --iso-8601); \\
           \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
         fi;

common/create-sbu_du-report.sh

@@ -6 +6 @@
 LOGSDIR=$1
 VERSION=$2
+DATE=$3
 
 LINE="================================================================================"
@@ -11 +12 @@
 # Make sure that we have a directory as first argument
 [[ ! -d "$LOGSDIR" ]] && \
-  echo -e "\nUSAGE: create-sbu_du-report.sh logs_directory [book_version]\n" && exit
+  echo -e "\nUSAGE: create-sbu_du-report.sh logs_directory [book_version] [date]\n" && exit
 
 # Make sure that the first argument is a jhalfs logs directory
@@ -19 +20 @@
 # If this script is run manually, the book version may be unknown
 [[ -z "$VERSION" ]] && VERSION=unknown
+[[ -z "$DATE" ]] && DATE=$(date --iso-8601)
 
 # If there is iteration logs directories, copy the logs inside iteration-1
@@ -26 +28 @@
 
 # Set the report file
-REPORT="$VERSION"-SBU_DU-$(date --iso-8601).report
+REPORT="$VERSION"-SBU_DU-"$DATE".report
 
 [ -f $REPORT ] && : >$REPORT