Making mount more robust

platform_tools/ios/bin/ios_setup.sh

 #!/bin/bash
 ###############################################################################
 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 ###############################################################################
 #
 # ios_setup.sh: Sets environment variables used by other iOS scripts.
 
@@ skipping 64 matching lines @@
   RET="$(cat $TARGET)"
   ios_umount
   echo -e "$RET"
 }
 
 # ios_mount: mounts the iOS device for reading or writing.
 ios_mount() {
   # If this is already mounted we unmount it.
   if $(mount | grep --quiet "$IOS_MOUNT_POINT"); then
     >&2 echo "Device already mounted at: $IOS_MOUNT_POINT - Unmounting."
-    ios_umount
+    ios_umount || true   
   fi
 
   # Ensure there is a mount directory.
   if [[ ! -d "$IOS_MOUNT_POINT" ]]; then
     mkdir -p $IOS_MOUNT_POINT
   fi
   ifuse --container $TEST_RUNNER_BUNDLE_ID $IOS_MOUNT_POINT
   sleep 1
   >&2 echo "Successfully mounted device."
 }
@@ skipping 82 matching lines @@
 #       adb_push_if_needed $HOST_SRC $ANDROID_DST
 #     else
 #       echo -n "$ANDROID_DST "
 #       $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")"
 #       $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST
 #     fi
 #   fi
 # }
 
 # setup_device "${DEVICE_ID}"