Update scripts for MagiskBoot

Noisyasfk · Mar 12, 2017 · 8833d21 · 8833d21
1 parent 1a3c522
commit 8833d21
Show file tree

Hide file tree

Showing 8 changed files with 331 additions and 514 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,8 +17,6 @@ ziptools/zipadjust
 
 # Generated scripts
 uninstaller/common/
-zip_static/common/magic_mask.sh
-zip_static/common/magisksu.sh
-zip_static/common/init.magisk.rc
-zip_static/common/custom_ramdisk_patch.sh
+zip_static/common/*.sh
+zip_static/common/*.rc
 zip_static/META-INF/com/google/android/update-binary
diff --git a/build.cmd b/build.cmd
@@ -75,10 +75,8 @@ EXIT /B %ERRORLEVEL%
   2>NUL RMDIR /S /Q zip_static\x64
   2>NUL RMDIR /S /Q zip_static\chromeos
   2>NUL DEL zip_static\META-INF\com\google\android\update-binary
-  2>NUL DEL zip_static\common\custom_ramdisk_patch.sh
-  2>NUL DEL zip_static\common\magisksu.sh
-  2>NUL DEL zip_static\common\init.magisk.rc
-  2>NUL DEL zip_static\common\magic_mask.sh
+  2>NUL DEL zip_static\common\*.sh
+  2>NUL DEL zip_static\common\*.rc
   2>NUL RMDIR /S /Q uninstaller\common
   2>NUL RMDIR /S /Q uninstaller\arm
   2>NUL RMDIR /S /Q uninstaller\arm64
@@ -104,7 +102,7 @@ EXIT /B %ERRORLEVEL%
   ECHO ************************
   ECHO * Copying Files
   ECHO ************************
-  COPY /Y scripts\custom_ramdisk_patch.sh zip_static\common\custom_ramdisk_patch.sh
+  COPY /Y scripts\ramdisk_patch.sh zip_static\common\ramdisk_patch.sh
   COPY /Y scripts\magisksu.sh zip_static\common\magisksu.sh
   COPY /Y scripts\init.magisk.rc zip_static\common\init.magisk.rc
   COPY /Y binaries\busybox-arm zip_static\arm\busybox

diff --git a/build.sh b/build.sh
@@ -26,10 +26,8 @@ cleanup() {
   rm -rfv zip_static/x64
   rm -rfv zip_static/chromeos
   rm -rfv zip_static/META-INF/com/google/android/update-binary
-  rm -rfv zip_static/common/custom_ramdisk_patch.sh
-  rm -rfv zip_static/common/magisksu.sh
-  rm -rfv zip_static/common/init.magisk.rc
-  rm -rfv zip_static/common/magic_mask.sh
+  rm -rfv zip_static/common/*.sh
+  rm -rfv zip_static/common/*.rc
   rm -rfv uninstaller/common
   rm -rfv uninstaller/arm
   rm -rfv uninstaller/arm64
@@ -77,7 +75,7 @@ zip_package() {
   echo "************************"
   echo "* Copying files"
   echo "************************"
-  cp -afv scripts/custom_ramdisk_patch.sh zip_static/common/custom_ramdisk_patch.sh
+  cp -afv scripts/ramdisk_patch.sh zip_static/common/ramdisk_patch.sh
   cp -afv scripts/magisksu.sh zip_static/common/magisksu.sh
   cp -afv scripts/init.magisk.rc zip_static/common/init.magisk.rc
   cp -afv binaries/busybox-arm zip_static/arm/busybox

diff --git a/scripts/custom_ramdisk_patch.sh b/scripts/custom_ramdisk_patch.sh