Rework DEFAULT_FROM due to dependence on FLAGS_board.

src/scripts/archive_build.sh

 #!/bin/bash
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to archive build results.  Used by the buildbots.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
 . "$(dirname "$0")/common.sh"
 
 # Script must be run outside the chroot
 assert_outside_chroot
 
 IMAGES_DIR="${DEFAULT_BUILD_ROOT}/images"
 # Default to the most recent image
 DEFAULT_TO="${GCLIENT_ROOT}/archive"
+DEFAULT_FROM="${IMAGES_DIR}/$DEFAULT_BOARD/$(ls -t1 \
+               $IMAGES_DIR/$DEFAULT_BOARD 2>&-| head -1)"
 
 # Flags
 DEFINE_string board "$DEFAULT_BOARD" \
   "The board to build packages for."
-DEFAULT_FROM="${IMAGES_DIR}/$FLAGS_board/$(ls -t1 $IMAGES_DIR/$FLAGS_board | head -1)"
 DEFINE_string from "$DEFAULT_FROM" \
   "Directory to archive"
 DEFINE_string to "$DEFAULT_TO" "Directory of build archive"
 DEFINE_integer keep_max 0 "Maximum builds to keep in archive (0=all)"
 DEFINE_string zipname "image.zip" "Name of zip file to create."
 DEFINE_boolean official_build $FLAGS_FALSE "Set CHROMEOS_OFFICIAL=1 for release builds."
 DEFINE_string build_number "" \
   "The build-bot build number (when called by buildbot only)." "b"
 DEFINE_boolean test_mod $FLAGS_TRUE "Modify image for testing purposes"
 
 # Parse command line
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
 
+# Reset "default" FLAGS_from based on passed-in board if not set on cmd-line
+if [ "$FLAGS_from" = "$DEFAULT_FROM" ]
+then
+   FLAGS_from="${IMAGES_DIR}/$FLAGS_board/$(ls -t1 \
+               $IMAGES_DIR/$FLAGS_board 2>&-| head -1)"
+fi
+
 # Die on any errors.
 set -e
 
+if [ ! -d "$FLAGS_from" ]
+then
+   echo "$FLAGS_from does not exist.  Exiting..."
+   exit 1
+fi
+
 if [ $FLAGS_official_build -eq $FLAGS_TRUE ]
 then
    CHROMEOS_OFFICIAL=1
 fi
 
 # Get version information
 . "${SCRIPTS_DIR}/chromeos_version.sh"
 
 # Get git hash
 # Use git:8 chars of sha1
@@ skipping 19 matching lines @@
 echo "archive to dir: $OUTDIR"
 echo "archive to file: $ZIPFILE"
 
 rm -rf "$OUTDIR"
 mkdir -p "$OUTDIR"
 
 # Modify image for test if flag set.
 if [ $FLAGS_test_mod -eq $FLAGS_TRUE ]
 then
   echo "Modifying image for test"
-  cp "${DEFAULT_FROM}/rootfs.image" "${DEFAULT_FROM}/rootfs_test.image"
+  cp "${FLAGS_from}/rootfs.image" "${FLAGS_from}/rootfs_test.image"
   "${SCRIPTS_DIR}/mod_image_for_test.sh" --image \
-      "${DEFAULT_FROM}/rootfs_test.image"
+      "${FLAGS_from}/rootfs_test.image"
 fi
 
 # Zip the build
 echo "Compressing and archiving build..."
-cd "$DEFAULT_FROM"
+cd "$FLAGS_from"
 zip -r "$ZIPFILE" *
 cd -
 
 # Update LATEST file
 echo "$LAST_CHANGE" > "${FLAGS_to}/LATEST"
 
 # Make sure files are readable
 chmod 644 "$ZIPFILE" "${FLAGS_to}/LATEST"
 chmod 755 "$OUTDIR"
 
 # Purge old builds if necessary
 if [ $FLAGS_keep_max -gt 0 ]
 then
   echo "Deleting old builds (all but the newest ${FLAGS_keep_max})..."
   cd "$FLAGS_to"
   # +2 because line numbers start at 1 and need to skip LATEST file
   rm -rf `ls -t1 | tail --lines=+$(($FLAGS_keep_max + 2))`
   cd -
 fi
 
 echo "Done."