replace test -n ... && clauses with proper ifs

mount_gpt_image.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.
 
 # Helper script that mounts chromium os image from a device or directory
 # and creates mount points for /var and /usr/local (if in dev_mode).
 
 . "$(dirname "$0")/common.sh"
@@ skipping 32 matching lines @@
   echo "Unmounting image from ${FLAGS_stateful_mountpt}" \
       "and ${FLAGS_rootfs_mountpt}"
   # Don't die on error to force cleanup
   set +e
   # Reset symlinks in /usr/local.
   setup_symlinks_on_root "/usr/local" "/var" \
     "${FLAGS_stateful_mountpt}"
   fix_broken_symlinks "${FLAGS_rootfs_mountpt}"
   sudo umount "${FLAGS_rootfs_mountpt}/usr/local"
   sudo umount "${FLAGS_rootfs_mountpt}/var"
-  test -n "${FLAGS_esp_mountpt}" && sudo umount -d "${FLAGS_esp_mountpt}"
+  if [[ -n "${FLAGS_esp_mountpt}" ]]; then
+    sudo umount -d "${FLAGS_esp_mountpt}"
+  fi
   sudo umount -d "${FLAGS_stateful_mountpt}"
   sudo umount -d "${FLAGS_rootfs_mountpt}"
   set -e
 }
 
 function get_usb_partitions() {
   sudo mount "${FLAGS_from}3" "${FLAGS_rootfs_mountpt}"
   sudo mount "${FLAGS_from}1" "${FLAGS_stateful_mountpt}"
-  test -n "${FLAGS_esp_mountpt}" && \
+  if [[ -n "${FLAGS_esp_mountpt}" ]]; then
     sudo mount "${FLAGS_from}12" "${FLAGS_esp_mountpt}"
+  fi
 }
 
 function get_gpt_partitions() {
   local filename="${FLAGS_image}"
 
   # Mount the rootfs partition using a loopback device.
   local offset=$(partoffset "${FLAGS_from}/${filename}" 3)
   sudo mount -o loop,offset=$(( offset * 512 )) "${FLAGS_from}/${filename}" \
     "${FLAGS_rootfs_mountpt}"
 
   # Mount the stateful partition using a loopback device.
   offset=$(partoffset "${FLAGS_from}/${filename}" 1)
   sudo mount -o loop,offset=$(( offset * 512 )) "${FLAGS_from}/${filename}" \
     "${FLAGS_stateful_mountpt}"
 
   # Mount the stateful partition using a loopback device.
   if [[ -n "${FLAGS_esp_mountpt}" ]]; then
     offset=$(partoffset "${FLAGS_from}/${filename}" 12)
     sudo mount -o loop,offset=$(( offset * 512 )) "${FLAGS_from}/${filename}" \
       "${FLAGS_esp_mountpt}"
   fi
 }
 
 # Mount a gpt based image.
 function mount_image() {
   mkdir -p "${FLAGS_rootfs_mountpt}"
   mkdir -p "${FLAGS_stateful_mountpt}"
-  test -n "${FLAGS_esp_mountpt}" && \
+  if [[ -n "${FLAGS_esp_mountpt}" ]]; then
     mkdir -p "${FLAGS_esp_mountpt}"
+  fi
 
   # Get the partitions for the image / device.
   if [ -b ${FLAGS_from} ] ; then
     get_usb_partitions
   else
     get_gpt_partitions
   fi
 
   # Mount directories and setup symlinks.
   sudo mount --bind "${FLAGS_stateful_mountpt}/var" \
@@ skipping 15 matching lines @@
 
 # Turn path into an absolute path.
 FLAGS_from=`eval readlink -f ${FLAGS_from}`
 
 # Perform desired operation.
 if [ ${FLAGS_unmount} -eq ${FLAGS_TRUE} ] ; then
   unmount_image
 else
   mount_image
 fi