pktsurf/smlinux
1
1
Fork 0
Code Issues 1 Pull requests Wiki Activity

Changes to bldpkg:

Browse source 
* Removed unnecessary code related to creation and use of temporary summary file in bldpkg
* Moved totaltime code inside showsummary if/else check
* Fixed comments
This commit is contained in:
PktSurf 2023-05-07 14:37:11 +05:30
parent f1f548ecd6
commit 258fdc4b56
1 changed files with 18 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
bldpkg
View file

@ -693,30 +693,25 @@ findelffiles() {
buildfilecleanup() { buildfilecleanup() {
# Discard all temporary files # Discard all temporary files
rm "$parenttmp/BUILDING" rm "$parenttmp/BUILDING"
# Autobuild discards $tempfile automatically, so only discard $tempfile if $autobuildtemp is unset
if [[ -z $autobuildtemp ]] ; then
rm "$tempfile"
fi
} }
prepbuildoutput() { prepbuildoutput() {
# Get the build completion time and store it in a variable
finishdate=$(date '+%a, %d %b %Y, %T')
# If compiletimea is set, then do a sum total of compiletimea and packagetimea variables to get the
# total time in seconds and use that as an argument for the runtime function. If compiletimea is not set,
# invoke the runtime function alone on new reset $SECONDS
if [[ -n $compiletimea ]] && [[ $pkgstatus = 0 ]] ; then
finalcompiletime=$((compiletimea + packagetimea))
totaltime=$(runtime $finalcompiletime)
else
totaltime=$(runtime $SECONDS)
fi
# Start of the showsummary if/else check # Start of the showsummary if/else check
if [[ $showsummary = 1 ]]; then if [[ $showsummary = 1 ]]; then
# Get the build completion time and store it in a variable
finishdate=$(date '+%a, %d %b %Y, %T')
# If compiletimea is set, then do a sum total of compiletimea and packagetimea variables to get the
# total time in seconds and use that as an argument for the runtime function. If compiletimea is not set,
# invoke the runtime function alone on new reset $SECONDS
if [[ -n $compiletimea ]] && [[ $pkgstatus = 0 ]] ; then
finalcompiletime=$((compiletimea + packagetimea))
totaltime=$(runtime $finalcompiletime)
else
totaltime=$(runtime $SECONDS)
fi
# Stick to 8/16 colours, those are supported on most terminals # Stick to 8/16 colours, those are supported on most terminals
if [[ $colours = 1 ]]; then if [[ $colours = 1 ]]; then
colourscheck=$(tput colors 2>/dev/null) colourscheck=$(tput colors 2>/dev/null)
@ -738,8 +733,8 @@ prepbuildoutput() {
# Determine the build type # Determine the build type
if [[ -n $autobuild ]]; then if [[ -n $autobuild ]]; then
# We are using Tadgy's autobuild system # We are using the autobuild system
buildsys="SSB Autobuild" buildsys="Autobuild"
else else
# We compiled the package manually # We compiled the package manually
buildsys="Manual" buildsys="Manual"
@ -821,7 +816,7 @@ prepbuildoutput() {
# Finally prepare the summary # Finally prepare the summary
# If we have $compiletimeb set, then assume the compile went well and output compile and packaging times into tempfile. # If we have $compiletimeb set, then assume the compile went well and output compile and packaging times inside a variable
if [[ -n $totaltime ]] && [[ -z $packagetimeb ]]; then if [[ -n $totaltime ]] && [[ -z $packagetimeb ]]; then
ttime="$totaltime" ttime="$totaltime"
elif [[ -n $totaltime ]] && [[ -n $packagetimeb ]]; then elif [[ -n $totaltime ]] && [[ -n $packagetimeb ]]; then
@ -835,7 +830,8 @@ prepbuildoutput() {
bsection="None" bsection="None"
fi fi
cat << EOF > "$tempfile" # Output the build summary to the user on every build
cat << EOF
$colourc ------------------------------------------------------------------------------- $colourd $colourc ------------------------------------------------------------------------------- $colourd
$colourc BUILD SUMMARY FOR PACKAGE $colourv'$app'$colourc VERSION $colourv'$version'$colourc TAG $colourv'$build' $colourc BUILD SUMMARY FOR PACKAGE $colourv'$app'$colourc VERSION $colourv'$version'$colourc TAG $colourv'$build'
$colourc ------------------------------------------------------------------------------- $colourd $colourc ------------------------------------------------------------------------------- $colourd
@ -854,9 +850,6 @@ $colourc Build Type: $colourd $buildsys & $bldtype
$colourc ------------------------------------------------------------------------------- $colourd $colourc ------------------------------------------------------------------------------- $colourd
EOF EOF
# Output the build summary to the user on every build
cat "$tempfile"
fi fi
# Completion of the showsummary if/else check # Completion of the showsummary if/else check
@ -1141,9 +1134,6 @@ if inarray "${tmp}" "${protecteddirectories[@]}" ; then
err "'tmp' VARIABLE IS SET TO '$tmp' WHICH IS A PROTECTED DIRECTORY! EXITING!" err "'tmp' VARIABLE IS SET TO '$tmp' WHICH IS A PROTECTED DIRECTORY! EXITING!"
fi fi
# Define a temporary file for printing summary
tempfile=$(mktemp "$parenttmp/SMBUILD.XXXXXX")
# https://unix.stackexchange.com/questions/462392/bash-the-function-is-executed-twice # https://unix.stackexchange.com/questions/462392/bash-the-function-is-executed-twice
# https://stackoverflow.com/questions/9256644/identifying-received-signal-name-in-bash/9256709 # https://stackoverflow.com/questions/9256644/identifying-received-signal-name-in-bash/9256709
# We use two traps to identify the signals, EXIT and INT. # We use two traps to identify the signals, EXIT and INT.