Fix signing script: Add missing quotes around string test.

scripts/image_signing/sign_official_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.
 
 # Sign the final build image using the "official" keys.
 #
 # Prerequisite tools needed in the system path:
 #
@@ skipping 34 matching lines @@
 done
 
 TYPE=$1
 INPUT_IMAGE=$2
 KEY_DIR=$3
 OUTPUT_IMAGE=$4
 
 # Re-calculate rootfs hash, update rootfs and kernel command line.
 # Args: IMAGE KEYBLOCK PRIVATEKEY
 recalculate_rootfs_hash() {
+  echo "Recalculating rootfs"
   local image=$1  # Input image.
   local keyblock=$2  # Keyblock for re-generating signed kernel partition
   local signprivate=$3  # Private key to use for signing.
 
   # First, grab the existing kernel partition and get the kernel config.
   temp_kimage=$(make_temp_file)
   extract_image_partition ${image} 2 ${temp_kimage}
   local kernel_config=$(sudo dump_kernel_config ${temp_kimage})
   local dm_config=$(echo $kernel_config |
     sed -e 's/.*dm="\([^"]*\)".*/\1/g' |
     cut -f2- -d,)
   # We extract dm=... portion of the config command line. Here's an example:
   #
   # dm="0 2097152 verity ROOT_DEV HASH_DEV 2097152 1 \
   # sha1 63b7ad16cb9db4b70b28593f825aa6b7825fdcf2"
   #
 
-  if [ -z ${dm_config} ]; then
+  if [ -z "${dm_config}" ]; then
     echo "WARNING: Couldn't grab dm_config. Aborting rootfs hash calculation"
     return
   fi
   local rootfs_sectors=$(echo ${dm_config} | cut -f2 -d' ')
   local root_dev=$(echo ${dm_config} | cut -f4 -d ' ')
   local hash_dev=$(echo ${dm_config} | cut -f5 -d ' ')
   local verity_depth=$(echo ${dm_config} | cut -f7 -d' ')
   local verity_algorithm=$(echo ${dm_config} | cut -f8 -d' ')
 
   # Mount the rootfs and run the verity tool on it.
@@ skipping 18 matching lines @@
   dd if=${hash_image} of=${rootfs_img} bs=512 \
     seek=${rootfs_sectors} conv=notrunc
 
   # Re-calculate kernel partition signature and command line.
   local updated_kimage=$(make_temp_file)
   vbutil_kernel --repack ${updated_kimage} \
     --keyblock ${keyblock} \
     --signprivate ${signprivate} \
     --oldblob ${temp_kimage} \
     --config ${temp_config}
-  
+
   replace_image_partition ${image} 2 ${updated_kimage}
   replace_image_partition ${image} 3 ${rootfs_img}
 }
 
 # Extracts the firmware update binaries from the a firmware update
 # shell ball (generated by src/platform/firmware/pack_firmware.sh)
 # Args: INPUT_SCRIPT OUTPUT_DIR
 get_firmwarebin_from_shellball() {
   local input=$1
   local output_dir=$2  
   uudecode -o - ${input} | tar -C ${output_dir} -zxf - 2>/dev/null || \
-    echo "Extracting firmware autoupdate failed.
-Try re-running with FW_NOUPDATE=1." && exit 1
+    echo "Extracting firmware autoupdate failed." && exit 1
 }
 
 # Re-sign the firmware AU payload inside the image rootfs with a new keys.
 # Args: IMAGE
 resign_firmware_payload() {
   local image=$1
 
   # Grab firmware image from the autoupdate shellball.
   local rootfs_dir=$(make_temp_dir)
   mount_image_partition ${image} 3 ${rootfs_dir}
@@ skipping 71 matching lines @@
 # Generate the factory install image.
 sign_for_factory_install() {
   ${SCRIPT_DIR}/resign_image.sh ${INPUT_IMAGE} ${OUTPUT_IMAGE} \
     ${KEY_DIR}/recovery_kernel_data_key.vbprivk \
     ${KEY_DIR}/installer_kernel.keyblock
   echo "Output signed factory install image to ${OUTPUT_IMAGE}"
 }
 
 # Firmware payload signing hidden behind a flag until it actually makes
 # it into the image.
-if [ ! "${FW_UPDATE}" == "1" ]; then
+if [ "${FW_UPDATE}" == "1" ]; then
   resign_firmware_payload ${INPUT_IMAGE}
 fi
 
 if [ "${TYPE}" == "ssd" ]; then
   recalculate_rootfs_hash ${INPUT_IMAGE} \
     ${KEY_DIR}/kernel.keyblock \
     ${KEY_DIR}/kernel_data_key.vbprivk
   sign_for_ssd
 elif [ "${TYPE}" == "recovery" ]; then
   recalculate_rootfs_hash ${INPUT_IMAGE} \
     ${KEY_DIR}/recovery_kernel.keyblock \
     ${KEY_DIR}/recovery_kernel_data_key.vbprivk
   sign_for_recovery
 elif [ "${TYPE}" == "install" ]; then
   recalculate_rootfs_hash ${INPUT_IMAGE} \
     ${KEY_DIR}/installer_kernel.keyblock \
     ${KEY_DIR}/recovery_kernel_data_key.vbprivk
   sign_for_factory_install
 else
   echo "Invalid type ${TYPE}"
   exit 1
 fi