Merge pull request #24 from TbhLovers/main

chore: azule -> pyzule

Author: SoCuul

.gitignore

@@ -41,7 +41,7 @@ Temporary Items
 _
 obj
 .theos
-packages/*.ipa
+packages
 
 # End of https://www.toptal.com/developers/gitignore/api/macos,theos-tweak
 

Makefile

@@ -14,4 +14,4 @@ BHInsta_CFLAGS = -fobjc-arc -Wno-unsupported-availability-guard -Wno-unused-valu
 
 include $(THEOS_MAKE_PATH)/tweak.mk
 
-SUBPROJECTS += libflex
+BHInsta_SUBPROJECTS += modules/libflex

README.md

@@ -51,7 +51,7 @@ A feature-rich tweak for Instagram on iOS!\
 - [Homebrew](https://brew.sh/#install)
 - [CMake](https://formulae.brew.sh/formula/cmake#default) (brew install cmake)
 - [Theos](https://theos.dev/docs/installation)
-- [Azule](https://github.com/Al4ise/Azule/wiki)
+- [pyzule](https://github.com/asdfzxcvbn/pyzule?tab=readme-ov-file#installation)
 
 ## Setup
 1. Install iOS 14.5 frameworks for theos

build.sh

@@ -1,23 +1,24 @@
 #!/usr/bin/env bash
 
-PROJECT_PATH=$(pwd)
 CMAKE_OSX_ARCHITECTURES="arm64e;arm64"
 
+ipaFile="$(find ./packages/*com.burbn.instagram*.ipa -type f -exec basename {} \;)"
+
+if [ -z "${ipaFile}" ]; then
+  echo -e '\033[1m\033[0;31m./packages/com.burbn.instagram.ipa not found.\nPlease put a decrypted Instagram IPA in its path.\033[0m'
+  exit 1
+elif [ -z "$(ls -A modules/libflex/FLEX)" ]; then
+  echo -e '\033[1m\033[0;31mFLEX submodule not found.\nPlease run the following command to checkout submodules:\n\n\033[0m    git submodule update --init --recursive'
+  exit 1
+fi
+
 echo -e '\033[1m\033[32mBuilding BHInsta tweak for sideloading (as IPA)\033[0m'
 
 make clean
 rm -rf .theos
 make
 
 # IPA File
-ipaFile="$(find ./packages/*com.burbn.instagram*.ipa -type f -exec basename {} \;)"
-
-if [ -n "${ipaFile}" ]; then
-
-  echo -e '\033[1m\033[32mBuilding the IPA.\033[0m'
-  azule -i "$PROJECT_PATH/packages/${ipaFile}" -o "$PROJECT_PATH/packages" -n BHInsta-sideloaded -r -f "$PROJECT_PATH/.theos/obj/debug/BHInsta.dylib" "$PROJECT_PATH/packages/Cephei.framework" "$PROJECT_PATH/packages/CepheiUI.framework" "$PROJECT_PATH/packages/CepheiPrefs.framework" "$PROJECT_PATH/modules/libflex/.theos/obj/debug/libbhFLEX.dylib"
-
-  echo -e "\033[1m\033[32mDone, we hope you enjoy BHInsta!\033[0m\n\nYou can find the ipa file at: $PROJECT_PATH/packages"
-else
-  echo -e '\033[1m\033[0;31m./packages/com.burbn.instagram.ipa not found.\nPlease put a decrypted Instagram IPA in its path.\033[0m'
-fi
+echo -e '\033[1m\033[32mBuilding the IPA.\033[0m'
+pyzule -i "packages/${ipaFile}" -o packages/BHInsta-sideloaded -uwsgf .theos/obj/debug/BHInsta.dylib .theos/obj/debug/libbhFLEX.dylib -m 15.0
+echo -e "\033[1m\033[32mDone, we hope you enjoy BHInsta!\033[0m\n\nYou can find the ipa file at: $(pwd)/packages"

modules/libflex/Makefile

@@ -1,4 +1,4 @@
-export ARCHS = arm64 arm64e
+export ARCHS = arm64
 TARGET := iphone:clang:latest:14.0
 include $(THEOS)/makefiles/common.mk