Code cleanup in main build file and section build files

base/ssb.base.SMBuild

@@ -20,7 +20,7 @@ fi
 . /etc/bldpkg.conf
 
 if [ -n "$autobuildtemp" ] ; then
-  autobuildtemp="$(echo $autobuildtemp)"
+  autobuildtemp="$autobuildtemp"
   export autobuildtemp
 fi
 
@@ -50,7 +50,7 @@ fi
 # any comments and blank lines removed.
 packages="$( egrep -v "^#|^$" .buildlist."$section" | cut -d'#' -f1 )"
 
-function list_packages() {
+list_packages() {
   local package
   echo "The following packages are built in this section, listed in processing order:"
 
@@ -60,7 +60,7 @@ function list_packages() {
     done ) | sed -e 's/, $//' | fmt -w 74 | sed -e 's/^/    /g'
 }
 
-function find_package_files() {
+find_package_files() {
   # $1 = Directory to look for files in [required]
   # $2 = Package name or regex to match.  An empty string matches all.
   # $3 = Package version or regex to match.  An empty string matches all.

extra/ssb.extra.SMBuild

@@ -20,7 +20,7 @@ fi
 . /etc/bldpkg.conf
 
 if [ -n "$autobuildtemp" ] ; then
-  autobuildtemp="$(echo $autobuildtemp)"
+  autobuildtemp="$autobuildtemp"
   export autobuildtemp
 fi
 
@@ -50,7 +50,7 @@ fi
 # any comments and blank lines removed.
 packages="$( egrep -v "^#|^$" .buildlist."$section" | cut -d'#' -f1 )"
 
-function list_packages() {
+list_packages() {
   local package
   echo "The following packages are built in this section, listed in processing order:"
 
@@ -60,7 +60,7 @@ function list_packages() {
     done ) | sed -e 's/, $//' | fmt -w 74 | sed -e 's/^/    /g'
 }
 
-function find_package_files() {
+find_package_files() {
   # $1 = Directory to look for files in [required]
   # $2 = Package name or regex to match.  An empty string matches all.
   # $3 = Package version or regex to match.  An empty string matches all.

gtk/ssb.gtk.SMBuild

@@ -20,7 +20,7 @@ fi
 . /etc/bldpkg.conf
 
 if [ -n "$autobuildtemp" ] ; then
-  autobuildtemp="$(echo $autobuildtemp)"
+  autobuildtemp="$autobuildtemp"
   export autobuildtemp
 fi
 
@@ -50,7 +50,7 @@ fi
 # any comments and blank lines removed.
 packages="$( egrep -v "^#|^$" .buildlist."$section" | cut -d'#' -f1 )"
 
-function list_packages() {
+list_packages() {
   local package
   echo "The following packages are built in this section, listed in processing order:"
 
@@ -60,7 +60,7 @@ function list_packages() {
     done ) | sed -e 's/, $//' | fmt -w 74 | sed -e 's/^/    /g'
 }
 
-function find_package_files() {
+find_package_files() {
   # $1 = Directory to look for files in [required]
   # $2 = Package name or regex to match.  An empty string matches all.
   # $3 = Package version or regex to match.  An empty string matches all.

heavybuilds/ssb.heavybuilds.SMBuild

@@ -20,7 +20,7 @@ fi
 . /etc/bldpkg.conf
 
 if [ -n "$autobuildtemp" ] ; then
-  autobuildtemp="$(echo $autobuildtemp)"
+  autobuildtemp="$autobuildtemp"
   export autobuildtemp
 fi
 
@@ -50,7 +50,7 @@ fi
 # any comments and blank lines removed.
 packages="$( egrep -v "^#|^$" .buildlist."$section" | cut -d'#' -f1 )"
 
-function list_packages() {
+list_packages() {
   local package
   echo "The following packages are built in this section, listed in processing order:"
 
@@ -60,7 +60,7 @@ function list_packages() {
     done ) | sed -e 's/, $//' | fmt -w 74 | sed -e 's/^/    /g'
 }
 
-function find_package_files() {
+find_package_files() {
   # $1 = Directory to look for files in [required]
   # $2 = Package name or regex to match.  An empty string matches all.
   # $3 = Package version or regex to match.  An empty string matches all.

net/ssb.net.SMBuild

@@ -20,7 +20,7 @@ fi
 . /etc/bldpkg.conf
 
 if [ -n "$autobuildtemp" ] ; then
-  autobuildtemp="$(echo $autobuildtemp)"
+  autobuildtemp="$autobuildtemp"
   export autobuildtemp
 fi
 
@@ -50,7 +50,7 @@ fi
 # any comments and blank lines removed.
 packages="$( egrep -v "^#|^$" .buildlist."$section" | cut -d'#' -f1 )"
 
-function list_packages() {
+list_packages() {
   local package
   echo "The following packages are built in this section, listed in processing order:"
 
@@ -60,7 +60,7 @@ function list_packages() {
     done ) | sed -e 's/, $//' | fmt -w 74 | sed -e 's/^/    /g'
 }
 
-function find_package_files() {
+find_package_files() {
   # $1 = Directory to look for files in [required]
   # $2 = Package name or regex to match.  An empty string matches all.
   # $3 = Package version or regex to match.  An empty string matches all.

ssb.SMBuild

@@ -14,7 +14,7 @@ sections="${sections:-  base xorg gtk extra net xfce }"
 generatereports=0
 
 # Usage.
-function usage() {
+usage() {
   cat << EOF
 Usage: ${0##*/} [options]
 
@@ -29,7 +29,7 @@ EOF
 
 export -f usage
 
-function list_packages() {
+list_packages() {
   echo "The sections and packages below (listed in processing order) will be built."
   for section in $sections
   do
@@ -39,7 +39,7 @@ function list_packages() {
   done
 }
 
-function runtime() {
+runtime() {
   # $1 = Number of seconds to convert to readable text
 
   local D=$(( $1 / 86400 ))
@@ -75,7 +75,7 @@ mkdir -p $pkgdest $logsdir
 autobuildtemp="$(mktemp $parenttmp/SMBUILD.XXXXXX)"
 export autobuildtemp
 
-function autointerruptsummary() {
+autointerruptsummary() {
    cat "$autobuildtemp"
    rm "$autobuildtemp"
 }

xfce/ssb.xfce.SMBuild

@@ -20,7 +20,7 @@ fi
 . /etc/bldpkg.conf
 
 if [ -n "$autobuildtemp" ] ; then
-  autobuildtemp="$(echo $autobuildtemp)"
+  autobuildtemp="$autobuildtemp"
   export autobuildtemp
 fi
 
@@ -50,7 +50,7 @@ fi
 # any comments and blank lines removed.
 packages="$( egrep -v "^#|^$" .buildlist."$section" | cut -d'#' -f1 )"
 
-function list_packages() {
+list_packages() {
   local package
   echo "The following packages are built in this section, listed in processing order:"
 
@@ -60,7 +60,7 @@ function list_packages() {
     done ) | sed -e 's/, $//' | fmt -w 74 | sed -e 's/^/    /g'
 }
 
-function find_package_files() {
+find_package_files() {
   # $1 = Directory to look for files in [required]
   # $2 = Package name or regex to match.  An empty string matches all.
   # $3 = Package version or regex to match.  An empty string matches all.

xorg/ssb.xorg.SMBuild

@@ -20,7 +20,7 @@ fi
 . /etc/bldpkg.conf
 
 if [ -n "$autobuildtemp" ] ; then
-  autobuildtemp="$(echo $autobuildtemp)"
+  autobuildtemp="$autobuildtemp"
   export autobuildtemp
 fi
 
@@ -50,7 +50,7 @@ fi
 # any comments and blank lines removed.
 packages="$( egrep -v "^#|^$" .buildlist."$section" | cut -d'#' -f1 )"
 
-function list_packages() {
+list_packages() {
   local package
   echo "The following packages are built in this section, listed in processing order:"
 
@@ -60,7 +60,7 @@ function list_packages() {
     done ) | sed -e 's/, $//' | fmt -w 74 | sed -e 's/^/    /g'
 }
 
-function find_package_files() {
+find_package_files() {
   # $1 = Directory to look for files in [required]
   # $2 = Package name or regex to match.  An empty string matches all.
   # $3 = Package version or regex to match.  An empty string matches all.