Use fuse umount on Linux

Signed-off-by: Anestis Bechtsoudis <anestis@census-labs.com>
anestisb · Aug 11, 2018 · 064314a · 064314a
1 parent d4866ad
commit 064314a
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/execute-all.sh b/execute-all.sh
@@ -9,7 +9,7 @@ set -u # fail on undefined variable
 
 readonly SCRIPTS_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 readonly TMP_WORK_DIR=$(mktemp -d /tmp/android_prepare_vendor.XXXXXX) || exit 1
-declare -a SYS_TOOLS=("mkdir" "dirname" "wget" "mount" "umount" "shasum")
+declare -a SYS_TOOLS=("mkdir" "dirname" "wget" "mount" "shasum")
 readonly HOST_OS="$(uname -s)"
 
 # Realpath implementation in bash
@@ -108,7 +108,7 @@ unmount_raw_image() {
   local mount_point="$1"
 
   if [[ -d "$mount_point" && "$USE_DEBUGFS" = false ]]; then
-    umount "$mount_point" || {
+    $_UMOUNT "$mount_point" || {
       echo "[-] '$mount_point' unmount failed"
       exit 1
     }
@@ -316,6 +316,17 @@ JAVA_FOUND=false
 check_bash_version
 check_compatible_system
 
+# Platform specific commands
+if isDarwin; then
+  SYS_TOOLS+=("umount")
+  _UMOUNT=umount
+else
+  # For Linux use debugfs
+  SYS_TOOLS+=("fusermount")
+  _UMOUNT="fusermount -u"
+fi
+
+
 # Check that system tools exist
 for i in "${SYS_TOOLS[@]}"
 do