Merge pull request #5 from ianchb/maodf-patch

Solve conflicts with MIUI-AOD-Freely
ianchb · Feb 18, 2023 · fbde294 · fbde294
2 parents 0e23996 + d09c0c6
commit fbde294
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/module.prop b/module.prop
@@ -1,7 +1,7 @@
 id=MIUI_Flash_Freely
 name=MIUI Flash Freely
-version=v4.2.0120
-versionCode=8
+version=v4.3.0218
+versionCode=9
 author=siergtc
 description=View https://github.com/ianchb/MIUI-Flash-Freely for more.
 updateJson=https://update.ap.icu/mff
diff --git a/post-fs-data.sh b/post-fs-data.sh
@@ -11,5 +11,11 @@ done
 CHANGE=$MODDIR/system/$TARGET_PATH
 mkdir -p $CHANGE
 rm $CHANGE/*
-cp -f $TARGET_PATH/* $CHANGE/
-sed -i 's/"support_ota_validate">true</"support_ota_validate">false</g' $CHANGE/*.xml
+if [ ! -f $MODDIR/../maodf.marker ]; then
+    cp -f $TARGET_PATH/* $CHANGE/
+    sed -i 's/"support_ota_validate">true</"support_ota_validate">false</g' $CHANGE/*.xml
+else
+    sed -i 's/"support_ota_validate">true</"support_ota_validate">false</g' $MODDIR/../MIUI_AOD_Freely/system/$TARGET_PATH/*.xml
+    cp -f $MODDIR/../MIUI_AOD_Freely/system/$TARGET_PATH/* $CHANGE/
+fi
+touch $MODDIR/../mff.marker
diff --git a/service.sh b/service.sh
@@ -0,0 +1,2 @@
+MODDIR=${0%/*}
+rm -f $MODDIR/../mff.marker