commit f997f1cf35188ee40c05a458ac105aafbf497240
author Erik Jensen <erikjensen@rkjnsn.net> Fri Apr 30 05:42:41 2021 +0000
committer micky387 <mickaelsaibi@free.fr> Tue Jul 25 10:36:14 2023 +0200
tree 8c46f7ae5a7e61a27b6f3cea5de32f5d78bbc6f0
parent ba085cd10af1faac6f29223f377ece52741c1a50

backuptool: Support tab-delimited fstab

Change-Id: Ib3fcde92d0c1ebb8754b11c577e4885d8dd02624

prebuilt/common/bin/backuptool.sh

diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index 73a31fc..b546b4e 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -100,7 +100,7 @@
 }
 
 get_block_for_mount_point() {
-  grep -v "^#" /etc/recovery.fstab | grep " $1 " | tail -n1 | tr -s ' ' | cut -d' ' -f1
+  grep -v "^#" /etc/recovery.fstab | grep "[[:blank:]]$1[[:blank:]]" | tail -n1 | tr -s [:blank:] ' ' | cut -d' ' -f1
 }
 
 find_block() {

prebuilt/common/bin/backuptool_ab.sh

diff --git a/prebuilt/common/bin/backuptool_ab.sh b/prebuilt/common/bin/backuptool_ab.sh
index 433ec78..f90d31f 100755
--- a/prebuilt/common/bin/backuptool_ab.sh
+++ b/prebuilt/common/bin/backuptool_ab.sh
@@ -99,7 +99,7 @@
 ### Mount helpers ###
 #####################
 get_block_for_mount_point() {
-  grep -v "^#" /vendor/etc/fstab.$(getprop ro.boot.hardware) | grep " $1 " | tail -n1 | tr -s ' ' | cut -d' ' -f1
+  grep -v "^#" /vendor/etc/fstab.$(getprop ro.boot.hardware) | grep "[[:blank:]]$1[[:blank:]]" | tail -n1 | tr -s [:blank:] ' ' | cut -d' ' -f1
 }
 
 find_block() {