From 258fdc4b56d6303284715b22c8ff184e653eedb9 Mon Sep 17 00:00:00 2001
From: PktSurf <smlinux@pktsurf.in>
Date: Sun, 7 May 2023 14:37:11 +0530
Subject: [PATCH] Changes to bldpkg: * Removed unnecessary code related to
 creation and use of temporary summary file in bldpkg * Moved totaltime code
 inside showsummary if/else check * Fixed comments

---
 bldpkg | 46 ++++++++++++++++++----------------------------
 1 file changed, 18 insertions(+), 28 deletions(-)

diff --git a/bldpkg b/bldpkg
index 3ad4042..e059461 100755
--- a/bldpkg
+++ b/bldpkg
@@ -693,30 +693,25 @@ findelffiles() {
 buildfilecleanup() {
   # Discard all temporary files
   rm "$parenttmp/BUILDING" 
-
-  # Autobuild discards $tempfile automatically, so only discard $tempfile if $autobuildtemp is unset
-  if [[ -z $autobuildtemp ]] ; then
-    rm "$tempfile"
-  fi
 }
   
 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
   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
     if [[ $colours = 1 ]]; then
       colourscheck=$(tput colors 2>/dev/null)
@@ -738,8 +733,8 @@ prepbuildoutput() {
 
     # Determine the build type
     if [[ -n $autobuild ]]; then
-      # We are using Tadgy's autobuild system
-      buildsys="SSB Autobuild"
+      # We are using the autobuild system
+      buildsys="Autobuild"
     else
       # We compiled the package manually
       buildsys="Manual"
@@ -821,7 +816,7 @@ prepbuildoutput() {
 
     # 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
       ttime="$totaltime"
     elif [[ -n $totaltime ]] && [[ -n $packagetimeb ]]; then
@@ -835,7 +830,8 @@ prepbuildoutput() {
       bsection="None"
     fi
 
-    cat << EOF > "$tempfile"
+    # Output the build summary to the user on every build
+    cat << EOF
 $colourc ------------------------------------------------------------------------------- $colourd
 $colourc BUILD SUMMARY FOR PACKAGE $colourv'$app'$colourc VERSION $colourv'$version'$colourc TAG $colourv'$build'
 $colourc ------------------------------------------------------------------------------- $colourd
@@ -854,9 +850,6 @@ $colourc Build Type:  $colourd   $buildsys & $bldtype
 $colourc ------------------------------------------------------------------------------- $colourd
 EOF
 
-    # Output the build summary to the user on every build
-    cat "$tempfile"
-
   fi
   # 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!"
 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://stackoverflow.com/questions/9256644/identifying-received-signal-name-in-bash/9256709
 # We use two traps to identify the signals, EXIT and INT.