From ff7639942a81e5fd687b9f49269ba39765f79863 Mon Sep 17 00:00:00 2001 From: PktSurf Date: Tue, 4 Oct 2022 00:40:42 +0530 Subject: [PATCH] Modified grep command to only match package name in the beginning in section build files which in turn fixes faulty current package name output to build monitor --- base/ssb.base.SMBuild | 2 +- extra/ssb.extra.SMBuild | 2 +- gtk/ssb.gtk.SMBuild | 2 +- heavybuilds/ssb.heavybuilds.SMBuild | 2 +- net/ssb.net.SMBuild | 2 +- xfce/ssb.xfce.SMBuild | 2 +- xorg/ssb.xorg.SMBuild | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/base/ssb.base.SMBuild b/base/ssb.base.SMBuild index 9ffbd18..62e99c2 100755 --- a/base/ssb.base.SMBuild +++ b/base/ssb.base.SMBuild @@ -207,7 +207,7 @@ mkdir -p $pkgdest $logsdir/$section echo "*** Building package '$package'..." echo "*********************************************************************" # Get the current package number from the build list - currentpkgnumber="$(grep -wn "$package" .buildlist.$section | cut -d: -f 1)" + currentpkgnumber="$(grep -Ewn "^$package" .buildlist.$section | cut -d: -f 1)" export currentpkgnumber mkdir -p $pkgdest/$subdir ( cd $package && export pkgdest=$pkgdest/$subdir && diff --git a/extra/ssb.extra.SMBuild b/extra/ssb.extra.SMBuild index 9ffbd18..62e99c2 100755 --- a/extra/ssb.extra.SMBuild +++ b/extra/ssb.extra.SMBuild @@ -207,7 +207,7 @@ mkdir -p $pkgdest $logsdir/$section echo "*** Building package '$package'..." echo "*********************************************************************" # Get the current package number from the build list - currentpkgnumber="$(grep -wn "$package" .buildlist.$section | cut -d: -f 1)" + currentpkgnumber="$(grep -Ewn "^$package" .buildlist.$section | cut -d: -f 1)" export currentpkgnumber mkdir -p $pkgdest/$subdir ( cd $package && export pkgdest=$pkgdest/$subdir && diff --git a/gtk/ssb.gtk.SMBuild b/gtk/ssb.gtk.SMBuild index 9ffbd18..62e99c2 100755 --- a/gtk/ssb.gtk.SMBuild +++ b/gtk/ssb.gtk.SMBuild @@ -207,7 +207,7 @@ mkdir -p $pkgdest $logsdir/$section echo "*** Building package '$package'..." echo "*********************************************************************" # Get the current package number from the build list - currentpkgnumber="$(grep -wn "$package" .buildlist.$section | cut -d: -f 1)" + currentpkgnumber="$(grep -Ewn "^$package" .buildlist.$section | cut -d: -f 1)" export currentpkgnumber mkdir -p $pkgdest/$subdir ( cd $package && export pkgdest=$pkgdest/$subdir && diff --git a/heavybuilds/ssb.heavybuilds.SMBuild b/heavybuilds/ssb.heavybuilds.SMBuild index 9ffbd18..62e99c2 100755 --- a/heavybuilds/ssb.heavybuilds.SMBuild +++ b/heavybuilds/ssb.heavybuilds.SMBuild @@ -207,7 +207,7 @@ mkdir -p $pkgdest $logsdir/$section echo "*** Building package '$package'..." echo "*********************************************************************" # Get the current package number from the build list - currentpkgnumber="$(grep -wn "$package" .buildlist.$section | cut -d: -f 1)" + currentpkgnumber="$(grep -Ewn "^$package" .buildlist.$section | cut -d: -f 1)" export currentpkgnumber mkdir -p $pkgdest/$subdir ( cd $package && export pkgdest=$pkgdest/$subdir && diff --git a/net/ssb.net.SMBuild b/net/ssb.net.SMBuild index 9ffbd18..62e99c2 100755 --- a/net/ssb.net.SMBuild +++ b/net/ssb.net.SMBuild @@ -207,7 +207,7 @@ mkdir -p $pkgdest $logsdir/$section echo "*** Building package '$package'..." echo "*********************************************************************" # Get the current package number from the build list - currentpkgnumber="$(grep -wn "$package" .buildlist.$section | cut -d: -f 1)" + currentpkgnumber="$(grep -Ewn "^$package" .buildlist.$section | cut -d: -f 1)" export currentpkgnumber mkdir -p $pkgdest/$subdir ( cd $package && export pkgdest=$pkgdest/$subdir && diff --git a/xfce/ssb.xfce.SMBuild b/xfce/ssb.xfce.SMBuild index 9ffbd18..62e99c2 100755 --- a/xfce/ssb.xfce.SMBuild +++ b/xfce/ssb.xfce.SMBuild @@ -207,7 +207,7 @@ mkdir -p $pkgdest $logsdir/$section echo "*** Building package '$package'..." echo "*********************************************************************" # Get the current package number from the build list - currentpkgnumber="$(grep -wn "$package" .buildlist.$section | cut -d: -f 1)" + currentpkgnumber="$(grep -Ewn "^$package" .buildlist.$section | cut -d: -f 1)" export currentpkgnumber mkdir -p $pkgdest/$subdir ( cd $package && export pkgdest=$pkgdest/$subdir && diff --git a/xorg/ssb.xorg.SMBuild b/xorg/ssb.xorg.SMBuild index 9ffbd18..62e99c2 100755 --- a/xorg/ssb.xorg.SMBuild +++ b/xorg/ssb.xorg.SMBuild @@ -207,7 +207,7 @@ mkdir -p $pkgdest $logsdir/$section echo "*** Building package '$package'..." echo "*********************************************************************" # Get the current package number from the build list - currentpkgnumber="$(grep -wn "$package" .buildlist.$section | cut -d: -f 1)" + currentpkgnumber="$(grep -Ewn "^$package" .buildlist.$section | cut -d: -f 1)" export currentpkgnumber mkdir -p $pkgdest/$subdir ( cd $package && export pkgdest=$pkgdest/$subdir &&