From 94d439e7b2fa6e3f197faf55056a0de9b36feb07 Mon Sep 17 00:00:00 2001 From: PktSurf Date: Fri, 2 Sep 2022 10:42:40 +0530 Subject: [PATCH] Code cleanup in main build file and section build files --- base/ssb.base.SMBuild | 6 +++--- extra/ssb.extra.SMBuild | 6 +++--- gtk/ssb.gtk.SMBuild | 6 +++--- heavybuilds/ssb.heavybuilds.SMBuild | 6 +++--- net/ssb.net.SMBuild | 6 +++--- ssb.SMBuild | 8 ++++---- xfce/ssb.xfce.SMBuild | 6 +++--- xorg/ssb.xorg.SMBuild | 6 +++--- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/base/ssb.base.SMBuild b/base/ssb.base.SMBuild index e85b0c4..9ffbd18 100755 --- a/base/ssb.base.SMBuild +++ b/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. diff --git a/extra/ssb.extra.SMBuild b/extra/ssb.extra.SMBuild index e85b0c4..9ffbd18 100755 --- a/extra/ssb.extra.SMBuild +++ b/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. diff --git a/gtk/ssb.gtk.SMBuild b/gtk/ssb.gtk.SMBuild index e85b0c4..9ffbd18 100755 --- a/gtk/ssb.gtk.SMBuild +++ b/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. diff --git a/heavybuilds/ssb.heavybuilds.SMBuild b/heavybuilds/ssb.heavybuilds.SMBuild index e85b0c4..9ffbd18 100755 --- a/heavybuilds/ssb.heavybuilds.SMBuild +++ b/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. diff --git a/net/ssb.net.SMBuild b/net/ssb.net.SMBuild index e85b0c4..9ffbd18 100755 --- a/net/ssb.net.SMBuild +++ b/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. diff --git a/ssb.SMBuild b/ssb.SMBuild index 76ed57c..38f1e0c 100755 --- a/ssb.SMBuild +++ b/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" } diff --git a/xfce/ssb.xfce.SMBuild b/xfce/ssb.xfce.SMBuild index e85b0c4..9ffbd18 100755 --- a/xfce/ssb.xfce.SMBuild +++ b/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. diff --git a/xorg/ssb.xorg.SMBuild b/xorg/ssb.xorg.SMBuild index e85b0c4..9ffbd18 100755 --- a/xorg/ssb.xorg.SMBuild +++ b/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.