Fix two very broken tests for null strings in archive_build.sh

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.
@@ skipping 49 matching lines @@
 then
   # Keep the directory name of the current image set (*.bin).
   IMG_DIR="$(readlink ${IMAGES_DIR}/${FLAGS_board}/latest)"
   FLAGS_from="${IMAGES_DIR}/${FLAGS_board}/${IMG_DIR}"
   DEFAULT_USED=1
 fi
 
 # Die on any errors.
 set -e
 
-if [ -z $DEFAULT_USED ]
+if [ -z "$DEFAULT_USED" ]
 then
   if [ $FLAGS_test_mod -eq $FLAGS_TRUE ] || \
      [ $FLAGS_factory_install_mod -eq $FLAGS_TRUE ] || \
      [ $FLAGS_factory_test_mod -eq $FLAGS_TRUE ]
   then
     echo "test_mod requires that the default from path be used."
     echo "If non default behavior is desired, run mod_image_for_test manually"
     echo "re-run archive build without test_mod"
     exit 1
   fi
@@ skipping 156 matching lines @@
 
 function gsutil_archive() {
   IN_PATH="$1"
   OUT_PATH="$2"
   if [ -n "$FLAGS_gsutil_archive" ]
   then
     FULL_OUT_PATH="${FLAGS_gsutil_archive}/${OUT_PATH}"
     echo "Using gsutil to archive to ${OUT_PATH}..."
     ${FLAGS_gsutil} cp ${IN_PATH} ${FULL_OUT_PATH}
     ${FLAGS_gsutil} setacl ${FLAGS_acl} ${FULL_OUT_PATH}
-    if [ $FLAGS_gsd_gen_index != "" ]
+    if [ -n "$FLAGS_gsd_gen_index" ]
     then
       echo "Updating indexes..."
       ${FLAGS_gsd_gen_index} \
         --gsutil=${FLAGS_gsutil} \
         -a ${FLAGS_acl} \
         -p ${FULL_OUT_PATH} ${FLAGS_gsutil_archive}
     fi
   fi
 }
 
@@ skipping 35 matching lines @@
 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."