update is_mounted() in all places

patcher/CommonPatcher

@@ -35,11 +35,7 @@ ui_print() {
 }
 
 is_mounted () {
-	if [ -n "$2" ]; then
-		cat /proc/mounts | grep $1 | grep $2, >/dev/null
-	else
-		cat /proc/mounts | grep $1 >/dev/null
-	fi
+	grep -q " $(readlink -f ${1}) " /proc/mounts 2>/dev/null
 	return $?
 }
 

systest/SysTest

@@ -29,11 +29,7 @@ ui_print() {
 }
 
 is_mounted () {
-	if [ -n "$2" ]; then
-		cat /proc/mounts | grep $1 | grep $2, >/dev/null
-	else
-		cat /proc/mounts | grep $1 >/dev/null
-	fi
+	grep -q " $(readlink -f ${1}) " /proc/mounts 2>/dev/null
 	return $?
 }
 

uninstaller/META-INF/com/google/android/update-binary

@@ -26,12 +26,8 @@ grep_cmdline() {
 		sed -n "${REGEX}" 2>/dev/null
 }
 
-is_mounted() {
-	if [ -n "$2" ]; then
-		cat /proc/mounts | grep $1 | grep $2, >/dev/null
-	else
-		cat /proc/mounts | grep $1 >/dev/null
-	fi
+is_mounted () {
+	grep -q " $(readlink -f ${1}) " /proc/mounts 2>/dev/null
 	return $?
 }