CommonInstaller: config migration code fixes/improvements

CommonInstaller

@@ -1710,36 +1710,37 @@ check_cfg_setup () {
 		set_prop nanodroid_nlpbackend "${tmp_prop}"
 	fi
 
-	[ -z "${nanodroid_init}" ] && set_prop nanodroid_init \"10_sqlite 20_fstrim 30_logcat 40_external_sd 50_logscleaner\"
+	nanodroid_all_init='"10_sqlite 20_fstrim 30_logcat 40_external_sd 50_logscleaner"'
+
+	[ -z "${nanodroid_init}" ] && set_prop nanodroid_init "${nanodroid_all_init}"
 
 	# in NanoDroid 22.7 nanodroid_init has changed
 	if [ "${#nanodroid_init}" -eq 1 ]; then
-		tmp_prop="\"10_sqlite 20_fstrim 30_logcat 40_external_sd 50_logscleaner\""
 		sed -e '/^nanodroid_init/d' -i "${cfg_setup}"
-		set_prop nanodroid_init "${tmp_prop}"
+		set_prop nanodroid_init "${nanodroid_all_init}"
 	fi
 
-	[ -z "${nanodroid_utils}" ] && set_prop nanodroid_utils \"findfs findmnt hexdump lessecho lesskey lsblk lscpu lsipc lslocks lsns ncal whereis\"
+	nanodroid_all_utils='"findfs findmnt hexdump lessecho lesskey lsblk lscpu lsipc lslocks lsns ncal whereis"'
+
+	[ -z "${nanodroid_utils}" ] && set_prop nanodroid_utils "${nanodroid_all_utils}"
 
 	# in NanoDroid 22.7 nanodroid_util has changed
 	if [ "${#nanodroid_utils}" -eq 1 ]; then
-		tmp_prop="\"findfs findmnt hexdump lessecho lesskey lsblk lscpu lsipc lslocks lsns ncal whereis\""
-
 		sed -e '/^nanodroid_utils/d' -i "${cfg_setup}"
-		set_prop nanodroid_utils "${tmp_prop}"
+		set_prop nanodroid_utils "${nanodroid_all_utils}"
 	fi
 
 	# in NanoDroid 21.0.90 nanodroid_override was dropped
-	sed -e '/nanodroid_override/d' -i "${cfg_setup}"
+	sed -e '/^nanodroid_override/d' -i "${cfg_setup}"
 
 	# in NanoDroid 22.5 nanodroid_fonts was dropped
-	sed -e '/nanodroid_fonts/d' -i "${cfg_setup}"
+	sed -e '/^nanodroid_fonts/d' -i "${cfg_setup}"
 
 	# in NanoDroid 22.6 nanodroid_nano was dropped
-	sed -e '/nanodroid_nano/d' -i "${cfg_setup}"
+	sed -e '/^nanodroid_nano/d' -i "${cfg_setup}"
 
 	# in NanoDroid 22.6 nanodroid_zelda was dropped
-	sed -e '/nanodroid_zelda/d' -i "${cfg_setup}"
+	sed -e '/^nanodroid_zelda/d' -i "${cfg_setup}"
 
 	source "${cfg_setup}"
 }