From bcb3717751761b19e0eb6a7aa86c85e30118d046 Mon Sep 17 00:00:00 2001 From: shrihanDev Date: Sat, 6 Aug 2022 20:41:58 +0530 Subject: [PATCH 1/2] Revert "Shrihan test your code next time pls (Fix #165)" This reverts commit 9af2e9c664bf40c0f6c01f48762b8da9db29a9df. Signed-off-by: shrihanDev --- utils/checkJDKandAapt2.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/checkJDKandAapt2.js b/utils/checkJDKandAapt2.js index 701a1ffa..c5ee8aca 100644 --- a/utils/checkJDKandAapt2.js +++ b/utils/checkJDKandAapt2.js @@ -29,17 +29,17 @@ module.exports = async function (ws) { await actualExec('unzip revanced/aapt2.zip'); switch (os.arch()) { case 'arm64': { - await actualExec('cp arm64-v8a/aapt2 revanced/aapt2'); + await actualExec('cp revanced/arm64-v8a/aapt2 revanced/aapt2'); await actualExec('chmod +x revanced/aapt2'); break; } case 'arm': { - await actualExec('cp armeabi-v7a/aapt2 revanced/aapt2'); + await actualExec('cp revanced/armeabi-v7a/aapt2 revanced/aapt2'); await actualExec('chmod +x revanced/aapt2'); break; } } - await actualExec('rm -rf arm64-v8a armeabi-v7a x86 revanced/aapt2.zip'); + await actualExec('rm -rf revanced/arm64-v8a revanced/armeabi-v7a revanced/x86 revanced/aapt2.zip'); } }; From 216c536bf0d5208f67b5b0d56badf26c740875fa Mon Sep 17 00:00:00 2001 From: shrihanDev Date: Sat, 6 Aug 2022 20:44:24 +0530 Subject: [PATCH 2/2] fix: my dumb brain (#163 but better) Signed-off-by: shrihanDev --- utils/checkJDKandAapt2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/checkJDKandAapt2.js b/utils/checkJDKandAapt2.js index c5ee8aca..681f28e4 100644 --- a/utils/checkJDKandAapt2.js +++ b/utils/checkJDKandAapt2.js @@ -26,7 +26,7 @@ module.exports = async function (ws) { 'revanced/aapt2.zip', ws ); - await actualExec('unzip revanced/aapt2.zip'); + await actualExec('unzip revanced/aapt2.zip -d revanced/'); switch (os.arch()) { case 'arm64': { await actualExec('cp revanced/arm64-v8a/aapt2 revanced/aapt2');