Slightly update scripts

topjohnwu · topjohnwu · commit ef0e22cc41d0 · 2019-05-11T02:29:13.000-07:00
diff --git a/app/src/main/res/raw/nonroot_utils.sh b/app/src/main/res/raw/nonroot_utils.sh
@@ -1,9 +1,12 @@
 mount_partitions() {
-  [ "`getprop ro.build.ab_update`" = "true" ] && SLOT=`getprop ro.boot.slot_suffix` || SLOT=
+  [ "`getprop ro.build.ab_update`" = "true" ] && SLOT=`getprop ro.boot.slot_suffix`
   [ "`getprop ro.build.system_root_image`" = "true" ] && SYSTEM_ROOT=true || SYSTEM_ROOT=false
 }
 
 get_flags() {
   $SYSTEM_ROOT && KEEPVERITY=true || KEEPVERITY=false
   [ "`getprop ro.crypto.state`" = "encrypted" ] && KEEPFORCEENCRYPT=true || KEEPFORCEENCRYPT=false
+  RECOVERYMODE=false
 }
+
+run_migrations() { return; }

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,12 @@`
`1`	`1`	`mount_partitions() {`
`2`		- [ "`getprop ro.build.ab_update`" = "true" ] && SLOT=`getprop ro.boot.slot_suffix` \|\| SLOT=
	`2`	+ [ "`getprop ro.build.ab_update`" = "true" ] && SLOT=`getprop ro.boot.slot_suffix`
`3`	`3`	[ "`getprop ro.build.system_root_image`" = "true" ] && SYSTEM_ROOT=true \|\| SYSTEM_ROOT=false
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`get_flags() {`
`7`	`7`	`$SYSTEM_ROOT && KEEPVERITY=true \|\| KEEPVERITY=false`
`8`	`8`	[ "`getprop ro.crypto.state`" = "encrypted" ] && KEEPFORCEENCRYPT=true \|\| KEEPFORCEENCRYPT=false
	`9`	`+ RECOVERYMODE=false`
`9`	`10`	`}`
	`11`	`+`
	`12`	`+run_migrations() { return; }`