From 2425d066ff1336b14be2576d5d821416e01f3e37 Mon Sep 17 00:00:00 2001
From: Miepee <janbidler00@tutanota.com>
Date: Thu, 15 Jul 2021 11:08:22 +0200
Subject: [PATCH] use sed for apktool editing

---
 apktool.yml | 15 ---------------
 patcher.sh  |  9 ++++-----
 2 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 apktool.yml

diff --git a/apktool.yml b/apktool.yml
deleted file mode 100644
index 75f1379..0000000
--- a/apktool.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-!!brut.androlib.meta.MetaInfo
-apkFileName: AM2RWrapper.apk
-compressionType: false
-doNotCompress:
-- ogg
-- arsc
-isFrameworkApk: false
-packageInfo: null
-sdkInfo: null
-sharedLibrary: false
-sparseResources: false
-unknownFiles: {}
-usesFramework: null
-version: 2.3.4
-versionInfo: null
diff --git a/patcher.sh b/patcher.sh
index 25c02d7..ae836fd 100755
--- a/patcher.sh
+++ b/patcher.sh
@@ -81,7 +81,7 @@ cp -p data/android/AM2R.ini "${OUTPUT}"/
 cp data/files_to_copy/*.ogg "${OUTPUT}"/
 
 echo ""
-echo "Install high quality in-game music? Increases filesize by 194 MB and may lag the game!"
+echo "Install high quality in-game music? Increases filesize by 230 MB and may lag the game!"
 echo ""
 echo "[y/n]"
 
@@ -113,13 +113,12 @@ rm temp.zip
 
 echo "Packaging APK..."
 #decompile the apk
-apktool d -f data/android/AM2RWrapper.apk
+apktool d data/android/AM2RWrapper.apk
 #copy
 mv "${OUTPUT}" assets
 cp -Rp assets AM2RWrapper
-#supply an edited yaml thing to not compress ogg's
-wget https://github.com/Miepee/AM2R-Autopatcher-Android/raw/main/apktool.yml
-mv -f apktool.yml AM2RWrapper/apktool.yml
+#edited yaml thing to not compress ogg's
+sed -i "s/doNotCompress:/doNotCompress:\n- ogg/" AM2RWrapper/apktool.yml
 #build
 apktool b AM2RWrapper -o AM2R-"${VERSION}".apk