zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make the date of the SBU_DU file the same as the one reported at the end of

Browse source 
the jhalfs run. Note that date is the one when the run is started
This commit is contained in:
Pierre Labastie 2017-06-29 16:45:31 +00:00
parent a4acb1236b
commit c57747dba5
6 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CLFS/master.sh
View file

@ -1121,7 +1121,7 @@ CUSTOM_TOOLS: $custom_list
create-sbu_du-report: mk_SYSTOOLS create-sbu_du-report: mk_SYSTOOLS
@\$(call echo_message, Building) @\$(call echo_message, Building)
@if [ "\$(ADD_REPORT)" = "y" ]; then \\ @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); \\ \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
fi; fi;
@touch \$@ @touch \$@

2
CLFS2/master.sh
View file

@ -502,7 +502,7 @@ ROOT: $chowning
create-sbu_du-report: mk_LUSER create-sbu_du-report: mk_LUSER
@\$(call echo_message, Building) @\$(call echo_message, Building)
@if [ "\$(ADD_REPORT)" = "y" ]; then \\ @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); \\ \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
fi; fi;
@touch \$@ @touch \$@

2
CLFS3/master.sh
View file

@ -551,7 +551,7 @@ ROOT: $chowning
create-sbu_du-report: mk_LUSER create-sbu_du-report: mk_LUSER
@\$(call echo_message, Building) @\$(call echo_message, Building)
@if [ "\$(ADD_REPORT)" = "y" ]; then \\ @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); \\ \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
fi; fi;
@touch \$@ @touch \$@

2
HLFS/master.sh
View file

@ -616,7 +616,7 @@ BLFS_TOOL: $blfs_tool
create-sbu_du-report: mk_BOOT create-sbu_du-report: mk_BOOT
@\$(call echo_message, Building) @\$(call echo_message, Building)
@if [ "\$(ADD_REPORT)" = "y" ]; then \\ @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); \\ \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
fi; fi;
@touch \$@ @touch \$@

2
LFS/master.sh
View file

@ -574,7 +574,7 @@ CUSTOM_TOOLS: $custom_list
create-sbu_du-report: mk_BOOT create-sbu_du-report: mk_BOOT
@\$(call echo_message, Building) @\$(call echo_message, Building)
@if [ "\$(ADD_REPORT)" = "y" ]; then \\ @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); \\ \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
fi; fi;
@touch \$@ @touch \$@

6
common/create-sbu_du-report.sh
View file

@ -5,12 +5,13 @@ set -e
LOGSDIR=$1 LOGSDIR=$1
VERSION=$2 VERSION=$2
DATE=$3
LINE="================================================================================" LINE="================================================================================"
# Make sure that we have a directory as first argument # Make sure that we have a directory as first argument
[[ ! -d "$LOGSDIR" ]] && \ [[ ! -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 # Make sure that the first argument is a jhalfs logs directory
[[ ! -f "$LOGSDIR"/000-masterscript.log ]] && \ [[ ! -f "$LOGSDIR"/000-masterscript.log ]] && \
@ -18,6 +19,7 @@ LINE="==========================================================================
# If this script is run manually, the book version may be unknown # If this script is run manually, the book version may be unknown
[[ -z "$VERSION" ]] && VERSION=unknown [[ -z "$VERSION" ]] && VERSION=unknown
[[ -z "$DATE" ]] && DATE=$(date --iso-8601)
# If there is iteration logs directories, copy the logs inside iteration-1 # If there is iteration logs directories, copy the logs inside iteration-1
# to the top level dir # to the top level dir
@ -25,7 +27,7 @@ LINE="==========================================================================
cp $LOGSDIR/build_1/* $LOGSDIR cp $LOGSDIR/build_1/* $LOGSDIR
# Set the report file # Set the report file
REPORT="$VERSION"-SBU_DU-$(date --iso-8601).report REPORT="$VERSION"-SBU_DU-"$DATE".report
[ -f $REPORT ] && : >$REPORT [ -f $REPORT ] && : >$REPORT