Update to v2.6.4-v37

README.md

@@ -148,7 +148,7 @@ The fingerprints list will update without the need to update the entire module.
 
 Just run the `props` command and the list will be updated automatically. Use the -nw option to disable or disable it completely in the script settings (see ["Prop script settings"](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config#prop-script-settings) below). If you've disabled the this setting you can update the list manually in the `Edit device fingerprint` menu.
 
-**_Current fingerprints list version - v36_**
+**_Current fingerprints list version - v37_**
 
 
 ## Please add support for device X
@@ -290,7 +290,7 @@ If you can't run the `props` script for some reason, the logs are also stored in
 
 
 ## Credits
-@topjohnwu @ XDA Developers, for Magisk    
+@topjohnwu @ XDA Developers, for Magisk  
 @Zackptg5, @veez21 and @jenslody @ XDA Developers, for help and inspiration
 
 
@@ -302,6 +302,12 @@ Releases from v2.4.1 are compatible with Magisk v17+.
 
 
 ## Changelog
+### v2.6.4  
+- Fixed the "Delete prop values" function to properly delete persistent props.
+- Updated for the new paths introduced in Magisk v17.4-ab5fedda(17316).
+- Added and updated fingerprints for Google Nexus 10, Huawei P8 Lite and LG G5 850. List updated to v37.
+- Miscellaneous fixes.
+
 ### v2.6.3  
 - Fixed custom fingerprints list that broke with the fingerprints list optimisation in v2.5.0.
 - Added fingerprints for Huawei P9 Plus and HTC U12 Plus. List updated to v34.
@@ -472,7 +478,7 @@ Releases from v2.4.1 are compatible with Magisk v17+.
 
 
 ## Current fingerprints list
-### List v36  
+### List v37  
 - Asus Zenfone 2 Laser (6.0.1)
 - Asus Zenfone 4 Max (7.1.1)
 - Asus ZenPad S 8.0 (6.0.1)
@@ -482,6 +488,7 @@ Releases from v2.4.1 are compatible with Magisk v17+.
 - Google Nexus 6 (7.1.1)
 - Google Nexus 5X (8.1.0)
 - Google Nexus 6P (8.1.0)
+- Google Nexus 10 (5.1.1)
 - Google Pixel (9)
 - Google Pixel XL (9)
 - Google Pixel 2 (9)
@@ -503,6 +510,7 @@ Releases from v2.4.1 are compatible with Magisk v17+.
 - LeEco Le Pro3 (6.0.1)
 - LG G2 BS980 (5.0.2)
 - LG G4 H812 (6.0)
+- LG G5 H850 (8.0.0)
 - Motorola Moto C Plus (7.0)
 - Motorola Moto E4 (7.1.1)
 - Motorola Moto E4 Plus (7.1.1)

common/prints.sh

@@ -3,7 +3,7 @@
 # MagiskHide Props Config
 # By Didgeridoohan @ XDA Developers
 
-PRINTSV=36
+PRINTSV=37
 PRINTSTRANSF=250
 
 # Certified fingerprints
@@ -17,6 +17,7 @@ Google Nexus 5 (6.0.1)=google/hammerhead/hammerhead:6.0.1/M4B30Z/3437181:user/re
 Google Nexus 6 (7.1.1)=google/shamu/shamu:7.1.1/N6F27M/4299435:user/release-keys
 Google Nexus 5x (8.1.0)=google/bullhead/bullhead:8.1.0/OPM7.181105.004/5038062:user/release-keys__2018-11-05
 Google Nexus 6P (8.1.0)=google/angler/angler:8.1.0/OPM7.181105.004/5038062:user/release-keys__2018-11-05
+Google Nexus 10 (5.1.1)=google/mantaray/manta:5.1.1/LMY49J/2640980:user/release-keys
 Google Pixel (9)=google/sailfish/sailfish:9/PPR2.181005.003/4984323:user/release-keys__2018-10-05
 Google Pixel XL (9)=google/marlin/marlin:9/PPR2.181005.003/4984323:user/release-keys__2018-10-05
 Google Pixel 2 (9)=google/walleye/walleye:9/PQ1A.181105.017.A1/5081125:user/release-keys__2018-11-05
@@ -30,14 +31,15 @@ Huawei Honor 6X (8.0.0)=HONOR/BLN-AL10/HWBLN-H:8.0.0/HONORBLN-AL10/528(C00):user
 Huawei Honor 9 (8.0.0)=HONOR/STF-L09/HWSTF:8.0.0/HUAWEISTF-L09/364(C432):user/release-keys
 Huawei Mate 10 (8.0.0)=HUAWEI/ALP-L29/HWALP:8.0.0/HUAWEIALP-L29S/143(C636):user/release-keys__2018-10-01
 Huawei Mate 10 Pro (8.0.0)=HUAWEI/BLA-L29/HWBLA:8.0.0/HUAWEIBLA-L29S/137(C432):user/release-keys
-Huawei P8 Lite (8.0.0)=HUAWEI/PRA-LX1/HWPRA-H:8.0.0/HUAWEIPRA-LX1/386(C432):user/release-keys__2018-09-01
+Huawei P8 Lite (8.0.0)=HUAWEI/PRA-LX1/HWPRA-H:8.0.0/HUAWEIPRA-LX1/392(C432):user/release-keys__2018-11-05
 Huawei P9 (7.0)=HUAWEI/EVA-L09/HWEVA:7.0/HUAWEIEVA-L09/C432B502:user/release-keys
 Huawei P9 Lite (7.0)=HUAWEI/VNS-L31/HWVNS-H:7.0/HUAWEIVNS-L31/C432B414:user/release-keys__2018-06-01
 Huawei P9 Plus (7.0)=HUAWEI/VIE-L09/HWVIE:7.0/HUAWEIVIE-L09/C432B387:user/release-keys__2018-07-01
 Huawei P20 Pro (8.1.0)=HUAWEI/CLT-L29/HWCLT:8.1.0/HUAWEICLT-L29/128(C432):user/release-keys
 LeEco Le Pro3 (6.0.1)=LeEco/ZL1_NA/le_zl1:6.0.1/WEXNAOP5802101261S/letv01261206:user/release-keys
 LG G2 BS980 (5.0.2)=lge/g2_vzw/g2:5.0.2/LRX22G/15046001715f9:user/release-keys
 LG G4 H812 (6.0)=lge/p1_rgs_ca/p1:6.0/MRA58K/1601215569825:user/release-keys
+LG G5 H850 (8.0.0)=lge/h1_global_com/h1:8.0.0/OPR1.170623.032/182532053d3a3:user/release-keys__2018-09-01
 Motorola Moto C Plus (7.0)=motorola/panell_21_d/panell_d:7.0/NRD90M.03.040/040:user/release-keys
 Motorola Moto E4 (7.1.1)=motorola/sperry_sprint/sperry:7.1.1/NCQ26.69-64/68:user/release-keys
 Motorola Moto E4 Plus (7.1.1)=motorola/nicklaus_fn/nicklaus_fn:7.1.1/NMA26.42-156/183:user/release-keys

common/propsconf_late

@@ -9,7 +9,7 @@
 # In that case, feel free to delete it.
 
 # Script version
-SCRIPTV=17
+SCRIPTV=18
 SETTRANSF=2
 NOTTRANSF="OPTIONLATE"
 
@@ -18,6 +18,7 @@ COREPATH=CORE_PLACEHOLDER
 IMGPATH=$COREPATH/img
 MODPATH=$IMGPATH/MagiskHidePropsConf
 CACHELOC=CACHE_PLACEHOLDER
+POSTFILE=POST_PLACEHOLDER
 LATELOGFILE=$CACHELOC/propsconf_latefile.log
 
 FINGERPRINTENB=1
@@ -56,7 +57,7 @@ cleanup() {
 	done
 	# Suicide.
 	echo "Removing scripts." >> $LATELOGFILE 2>&1
-	rm -f $IMGPATH/.core/post-fs-data.d/propsconf_post >> $LATELOGFILE 2>&1
+	rm -f $POSTFILE >> $LATELOGFILE 2>&1
 	rm -f $0 >> $LATELOGFILE 2>&1
 }
 

common/util_functions.sh

@@ -6,8 +6,8 @@
 # Variables
 MODVERSION=VER_PLACEHOLDER
 MIRRORPATH=$COREPATH/mirror
-POSTFILE=$IMGPATH/.core/post-fs-data.d/propsconf_post
-LATEFILE=$IMGPATH/.core/service.d/propsconf_late
+POSTFILE=POST_PLACEHOLDER
+LATEFILE=LATE_PLACEHOLDER
 SYSTEMLOC=SYSTEM_PLACEHOLDER
 CACHELOC=CACHE_PLACEHOLDER
 POSTCHKFILE=$CACHELOC/propsconf_postchk
@@ -998,7 +998,14 @@ prop_del() {
 			log_handler "Deleting $ITEM."
 			TMPITEM=$( echo $(get_eq_right "$ITEM") | sed 's|_sp_| |g')
 			resetprop -v $ITEM >> $LOGFILE 2>&1
-			resetprop -v --delete $ITEM >> $LOGFILE 2>&1
+			case "$ITEM" in
+				persist*)
+					resetprop -pv --delete $ITEM >> $LOGFILE 2>&1
+				;;
+				*)
+					resetprop -v --delete $ITEM >> $LOGFILE 2>&1
+				;;
+			esac
 		done
 	fi
 }

config.sh

@@ -129,11 +129,21 @@ get_first() {
 }
 
 # Variables
-COREPATH=/sbin/.core
+if [ "$MAGISK_VER_CODE" -ge 17316 ]; then
+	COREPATH=/sbin/.magisk
+else
+	COREPATH=/sbin/.core
+fi
+ADBPATH=/data/adb
 BIMGPATH=$COREPATH/img
 $BOOTMODE && IMGPATH=$BIMGPATH || IMGPATH=$MOUNTPATH
-POSTPATH=$IMGPATH/.core/post-fs-data.d
-SERVICEPATH=$IMGPATH/.core/service.d
+if [ "$MAGISK_VER_CODE" -ge 17316 ]; then
+	POSTPATH=$ADBPATH/post-fs-data.d
+	SERVICEPATH=$ADBPATH/service.d
+else
+	POSTPATH=$IMGPATH/.core/post-fs-data.d
+	SERVICEPATH=$IMGPATH/.core/service.d
+fi
 POSTFILE=$POSTPATH/propsconf_post
 UPDATEPOSTFILE=$INSTALLER/common/propsconf_post
 LATEFILE=$SERVICEPATH/propsconf_late
@@ -143,7 +153,7 @@ if [ -z $SLOT ]; then
 	SYSTEMLOC=/system
 	CACHELOC=/cache
 else
-	SYSTEMLOC=/system/system
+	SYSTEMLOC=/system_root/system
 	CACHELOC=/data/cache
 fi
 INSTLOG=$CACHELOC/propsconf_install.log
@@ -397,7 +407,7 @@ install_check() {
 	fi
 }
 
-# Check for boot script in post-fs-data.d
+# Check for boot script in post-fs-data.d, in case someone's moved it
 post_check() {
 	if [ -f "$POSTLATEFILE" ]; then
 		log_handler "Removing boot script from post-fs-data.d."
@@ -418,9 +428,13 @@ script_install() {
 	placeholder_update $MODPATH/util_functions.sh USNFLIST USNF_PLACEHOLDER "$USNFLIST"
 	placeholder_update $MODPATH/util_functions.sh SYSTEMLOC SYSTEM_PLACEHOLDER "$SYSTEMLOC"
 	placeholder_update $MODPATH/util_functions.sh CACHELOC CACHE_PLACEHOLDER "$CACHELOC"
+	placeholder_update $MODPATH/util_functions.sh LATEFILE LATE_PLACEHOLDER "$LATEFILE"
+	placeholder_update $MODPATH/util_functions.sh POSTFILE POST_PLACEHOLDER "$POSTFILE"
 	placeholder_update $MODPATH/util_functions.sh MODVERSION VER_PLACEHOLDER "$MODVERSION"
 	placeholder_update $POSTFILE COREPATH CORE_PLACEHOLDER "$COREPATH"
+	placeholder_update $LATEFILE POSTFILE POST_PLACEHOLDER "$POSTFILE"
 	placeholder_update $LATEFILE COREPATH CORE_PLACEHOLDER "$COREPATH"
+	placeholder_update $MODPATH/system/$BIN/props LATEFILE LATE_PLACEHOLDER "$LATEFILE"
 	placeholder_update $MODPATH/system/$BIN/props COREPATH CORE_PLACEHOLDER "$COREPATH"
 	print_files
 }

module.prop

@@ -1,7 +1,7 @@
 id=MagiskHidePropsConf
 name=MagiskHide Props Config
-version=v2.6.3-v36
-versionCode=31
+version=v2.6.4-v37
+versionCode=32
 author=Didgeridoohan
 description=Change your device's fingerprint, to pass SafetyNet's CTS Profile check. Edit prop files for better root hiding. Set/reset prop values set by MagiskHide. Change any prop values easily, and set your own custom props.
 minMagisk=17000

system/binpath/props

@@ -21,7 +21,7 @@ fi
 COREPATH=CORE_PLACEHOLDER
 IMGPATH=$COREPATH/img
 MODPATH=$IMGPATH/MagiskHidePropsConf
-LATEFILE=$IMGPATH/.core/service.d/propsconf_late
+LATEFILE=LATE_PLACEHOLDER
 
 # Development testing set to false
 DEVTESTING=false
@@ -337,6 +337,7 @@ menu_pick_print() {
 			else
 				log_handler "No fingerprints list."
 				collect_logs "issue"
+				menu_header "${C}$1${N}\n Something's wrong!"
 				echo "Hm... That's not right."
 				echo ""
 				echo "There is currently no fingerprints list"