commit f13b49efc66a3e3e5b3f3897b5e5f124b0bd6a9e
author Don Garrett <dgarrett@google.com> Wed Mar 26 13:59:56 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Mar 27 20:38:40 2014 +0000
tree 6740c2c743750ba673be1a5dc20acd79ab307cb2
parent 36029a927c36cdfe13b4599dd3c2a3e40b7a312f

Address additional style nits in cros_generate_update_payload.

BUG=chromium:353558
TEST=Local payload generation trybot on stumpy-full.

Change-Id: Id8ad1e575b1393611a11e44e11e4e9cecec3c080
Reviewed-on: https://chromium-review.googlesource.com/191748
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Commit-Queue: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>

host/cros_generate_update_payload

diff --git a/host/cros_generate_update_payload b/host/cros_generate_update_payload
index 1abc739..c446139 100755
--- a/host/cros_generate_update_payload
+++ b/host/cros_generate_update_payload
@@ -83,7 +83,7 @@
   local err
   local ret
 
-  if [ ! -d  "$mnt_point" ]; then
+  if [[ ! -d  "$mnt_point" ]]; then
     return 0
   fi
 
@@ -113,8 +113,10 @@
   return $err
 }
 
-# Pass an arg to not exit 1 at the end
+# Pass any argument to this method during normal cleanup.
+# Otherwise, it will assume it was called from a trap, and exit 1.
 cleanup() {
+  local normally_invoked="$1"
   local err=""
 
   set +e
@@ -127,16 +129,16 @@
   DST_MNT=""
   STATE_MNT=""
 
-  if [ -z "$FLAGS_src_kern_path" ]; then
+  if [[ -z "$FLAGS_src_kern_path" ]]; then
     rm -f "$SRC_KERNEL" || err=1
   fi
-  if [ -z "$FLAGS_src_root_path" ]; then
+  if [[ -z "$FLAGS_src_root_path" ]]; then
     rm -f "$SRC_ROOT" || err=1
   fi
-  if [ -z "$FLAGS_kern_path" ]; then
+  if [[ -z "$FLAGS_kern_path" ]]; then
     rm -f "$DST_KERNEL" || err=1
   fi
-  if [ -z "$FLAGS_root_path" ]; then
+  if [[ -z "$FLAGS_root_path" ]]; then
     rm -f "$DST_ROOT" || err=1
   fi
 
@@ -144,12 +146,12 @@
   # cleanup (even if we eventually succeeded) return a non-zero exit
   # code. This triggers additional logging in most environments that call
   # this script.
-  if [ -n "$err" ]; then
+  if [[ -n "$err" ]]; then
     echo "Cleanup encountered an error."
     exit 2
   fi
 
-  if [ -z "$1" ]; then
+  if [[ -z "$normally_invoked" ]]; then
     echo "Cleanup success after an error."
     exit 1
   fi