changeset 1067:d4b0e9d731fc

Minor cleanup, collate the === announce lines.
author Rob Landley <rob@landley.net>
date Wed, 05 May 2010 22:57:05 -0500
parents 21ec839a416f
children 31b5d683ecc9
files sources/functions.sh system-image.sh
diffstat 2 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/sources/functions.sh	Wed May 05 22:28:47 2010 -0500
+++ b/sources/functions.sh	Wed May 05 22:57:05 2010 -0500
@@ -415,6 +415,9 @@
   PACKAGE="$1"
   unstable "$PACKAGE" && PACKAGE=alt-"$PACKAGE"
 
+  echo "=== Building $PACKAGE ($ARCH_NAME $STAGE_NAME)"
+  set_titlebar "$ARCH_NAME $STAGE_NAME $PACKAGE Building"
+
   # Make sure the source is already extracted and up-to-date.
   cd "${SRCDIR}" &&
   extract_package "${PACKAGE}-"*.tar* || exit 1
@@ -433,9 +436,6 @@
 
   [ -z "$SNAPSHOT_SYMLINK" ] && LINKTYPE="l" || LINKTYPE="s"
 
-  # Announce package, with easy-to-grep-for "===" marker.
-
-  echo "=== Building $PACKAGE ($ARCH_NAME $STAGE_NAME)"
   echo "Snapshot '$PACKAGE'..."
   cd "${WORK}" || dienow
   if [ $# -lt 3 ]
@@ -457,9 +457,6 @@
   fi
   export WRAPPY_LOGPATH="$BUILD/logs/cmdlines.${ARCH_NAME}.${STAGE_NAME}.$1"
 
-  # Change window title bar to package now
-  set_titlebar "$ARCH_NAME $STAGE_NAME $PACKAGE"
-
   # Ugly bug workaround: timestamp granularity in a lot of filesystems is only
   # 1 second, so find -newer misses things installed in the same second, so we
   # make sure it's a new second before we start actually doing anything.
--- a/system-image.sh	Wed May 05 22:28:47 2010 -0500
+++ b/system-image.sh	Wed May 05 22:57:05 2010 -0500
@@ -204,4 +204,4 @@
 
 ARCH="$ARCH_NAME" create_stage_tarball
 
-echo -e "=== Packaging complete\e[0m"
+echo "=== Packaging complete"