From d81b72fed702a7f80d1b45e8f5fbe92bc8696f7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Mon, 20 Nov 2023 03:33:00 +0100 Subject: [PATCH 1/4] Add nixos derivation --- .gitignore | 5 ++++- default.nix | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 default.nix diff --git a/.gitignore b/.gitignore index f8383f5..74b0139 100644 --- a/.gitignore +++ b/.gitignore @@ -105,4 +105,7 @@ venv.bak/ # mypy .mypy_cache/ -test.py \ No newline at end of file +# nix +result* + +test.py diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..9ab2954 --- /dev/null +++ b/default.nix @@ -0,0 +1,22 @@ +with (import {}); + +stdenv.mkDerivation { + name = "waydroid_script"; + + buildInputs = [ + (python3.withPackages(ps: with ps; [ tqdm requests inquirerpy ])) + ]; + + src = ./.; + + postPatch = '' + patchShebangs main.py + ''; + + installPhase = '' + mkdir -p $out/libexec + cp -r . $out/libexec/waydroid_script + mkdir -p $out/bin + ln -s $out/libexec/waydroid_script/main.py $out/bin/waydroid_script + ''; +} From cd6239737abd1170c01bc740bcc0e013f77e909e Mon Sep 17 00:00:00 2001 From: Casu Al Snek Date: Tue, 9 Jan 2024 09:09:14 +0545 Subject: [PATCH 2/4] Downgrade magisk to Magisk_Delta_25210_canary_fdac22ba --- stuff/magisk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stuff/magisk.py b/stuff/magisk.py index 0e2bc1f..f51cdcc 100644 --- a/stuff/magisk.py +++ b/stuff/magisk.py @@ -10,7 +10,7 @@ from tools import container class Magisk(General): id = "magisk delta" partition = "system" - dl_link = "https://huskydg.github.io/magisk-files/app-debug.apk" + dl_link = "https://github.com/casualsnek/miscpackages/raw/main/Magisk_Delta_25210_canary_fdac22ba.apk" dl_file_name = "magisk.apk" extract_to = "/tmp/magisk_unpack" magisk_dir = os.path.join(partition, "etc", "init", "magisk") From d31988a829445efe9b2fecdf702e21b9a1b09aac Mon Sep 17 00:00:00 2001 From: mistrmochov <142264185+mistrmochov@users.noreply.github.com> Date: Tue, 9 Jan 2024 16:44:57 +0100 Subject: [PATCH 3/4] Update to Magisk Delta 26.3 Your script works fine with last Magisk Delta (before Kitsune Mask update). Also with modified setup for bootanim --- stuff/magisk.py | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/stuff/magisk.py b/stuff/magisk.py index f51cdcc..7e2ec1c 100644 --- a/stuff/magisk.py +++ b/stuff/magisk.py @@ -10,7 +10,7 @@ from tools import container class Magisk(General): id = "magisk delta" partition = "system" - dl_link = "https://github.com/casualsnek/miscpackages/raw/main/Magisk_Delta_25210_canary_fdac22ba.apk" + dl_link = "https://github.com/HuskyDG/magisk-files-old/raw/main/app-release.apk" dl_file_name = "magisk.apk" extract_to = "/tmp/magisk_unpack" magisk_dir = os.path.join(partition, "etc", "init", "magisk") @@ -29,30 +29,28 @@ service bootanim /system/bin/bootanimation bootanim_component = f""" on post-fs-data start logd - exec u:r:su:s0 root root -- /system/etc/init/magisk/magisk{host()[1]} --auto-selinux --setup-sbin /system/etc/init/magisk - exec u:r:su:s0 root root -- /system/etc/init/magisk/magiskpolicy --live --magisk "allow * magisk_file lnk_file *" - mkdir /sbin/.magisk 700 - mkdir /sbin/.magisk/mirror 700 - mkdir /sbin/.magisk/block 700 - copy /system/etc/init/magisk/config /sbin/.magisk/config - rm /dev/.magisk_unblock - exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --post-fs-data - wait /dev/.magisk_unblock 40 - rm /dev/.magisk_unblock - -on zygote-start - exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --service + exec u:r:su:s0 root root -- /system/etc/init/magisk/magiskpolicy --live --magisk + exec u:r:magisk:s0 root root -- /system/etc/init/magisk/magiskpolicy --live --magisk + exec u:r:update_engine:s0 root root -- /system/etc/init/magisk/magiskpolicy --live --magisk + mkdir /dev/magisk_iqeoVo2mDrO 700 + exec u:r:su:s0 root root -- /system/etc/init/magisk/magisk64 --auto-selinux --setup-sbin /system/etc/init/magisk /dev/magisk_iqeoVo2mDrO + exec u:r:su:s0 root root -- /dev/magisk_iqeoVo2mDrO/magisk --auto-selinux --post-fs-data + +on nonencrypted + exec u:r:su:s0 root root -- /dev/magisk_iqeoVo2mDrO/magisk --auto-selinux --service + +on property:vold.decrypt=trigger_restart_framework + exec u:r:su:s0 root root -- /dev/magisk_iqeoVo2mDrO/magisk --auto-selinux --service on property:sys.boot_completed=1 mkdir /data/adb/magisk 755 - exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --boot-complete - exec -- /system/bin/sh -c "if [ ! -e /data/data/io.github.huskydg.magisk ] ; then pm install /system/etc/init/magisk/magisk.apk ; fi" + exec u:r:su:s0 root root -- /dev/magisk_iqeoVo2mDrO/magisk --auto-selinux --boot-complete on property:init.svc.zygote=restarting - exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --zygote-restart + exec u:r:su:s0 root root -- /dev/magisk_iqeoVo2mDrO/magisk --auto-selinux --zygote-restart on property:init.svc.zygote=stopped - exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --zygote-restart + exec u:r:su:s0 root root -- /dev/magisk_iqeoVo2mDrO/magisk --auto-selinux --zygote-restart """ def download(self): From 7cccf2b56d069a37163d07f365ea516ca2ac6670 Mon Sep 17 00:00:00 2001 From: mistrmochov <142264185+mistrmochov@users.noreply.github.com> Date: Wed, 10 Jan 2024 19:16:24 +0100 Subject: [PATCH 4/4] Maintainer of Magisk Delta, just deleted the repo for older Magisk Delta, so I put it on my repo --- stuff/magisk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stuff/magisk.py b/stuff/magisk.py index 7e2ec1c..86f8084 100644 --- a/stuff/magisk.py +++ b/stuff/magisk.py @@ -10,7 +10,7 @@ from tools import container class Magisk(General): id = "magisk delta" partition = "system" - dl_link = "https://github.com/HuskyDG/magisk-files-old/raw/main/app-release.apk" + dl_link = "https://github.com/mistrmochov/magiskdeltaorig/raw/main/app-release.apk" dl_file_name = "magisk.apk" extract_to = "/tmp/magisk_unpack" magisk_dir = os.path.join(partition, "etc", "init", "magisk")