diff --git a/TrollInstaller2/.gitignore b/Installer/TrollInstaller2/.gitignore similarity index 100% rename from TrollInstaller2/.gitignore rename to Installer/TrollInstaller2/.gitignore diff --git a/TrollInstaller2/Makefile b/Installer/TrollInstaller2/Makefile similarity index 100% rename from TrollInstaller2/Makefile rename to Installer/TrollInstaller2/Makefile diff --git a/TrollInstaller2/Resources/AppIcon29x29.png b/Installer/TrollInstaller2/Resources/AppIcon29x29.png similarity index 100% rename from TrollInstaller2/Resources/AppIcon29x29.png rename to Installer/TrollInstaller2/Resources/AppIcon29x29.png diff --git a/TrollInstaller2/Resources/AppIcon29x29@2x.png b/Installer/TrollInstaller2/Resources/AppIcon29x29@2x.png similarity index 100% rename from TrollInstaller2/Resources/AppIcon29x29@2x.png rename to Installer/TrollInstaller2/Resources/AppIcon29x29@2x.png diff --git a/TrollInstaller2/Resources/AppIcon29x29@3x.png b/Installer/TrollInstaller2/Resources/AppIcon29x29@3x.png similarity index 100% rename from TrollInstaller2/Resources/AppIcon29x29@3x.png rename to Installer/TrollInstaller2/Resources/AppIcon29x29@3x.png diff --git a/TrollInstaller2/Resources/AppIcon40x40.png b/Installer/TrollInstaller2/Resources/AppIcon40x40.png similarity index 100% rename from TrollInstaller2/Resources/AppIcon40x40.png rename to Installer/TrollInstaller2/Resources/AppIcon40x40.png diff --git a/TrollInstaller2/Resources/AppIcon40x40@2x.png b/Installer/TrollInstaller2/Resources/AppIcon40x40@2x.png similarity index 100% rename from TrollInstaller2/Resources/AppIcon40x40@2x.png rename to Installer/TrollInstaller2/Resources/AppIcon40x40@2x.png diff --git a/TrollInstaller2/Resources/AppIcon40x40@3x.png b/Installer/TrollInstaller2/Resources/AppIcon40x40@3x.png similarity index 100% rename from TrollInstaller2/Resources/AppIcon40x40@3x.png rename to Installer/TrollInstaller2/Resources/AppIcon40x40@3x.png diff --git a/TrollInstaller2/Resources/AppIcon50x50.png b/Installer/TrollInstaller2/Resources/AppIcon50x50.png similarity index 100% rename from TrollInstaller2/Resources/AppIcon50x50.png rename to Installer/TrollInstaller2/Resources/AppIcon50x50.png diff --git a/TrollInstaller2/Resources/AppIcon50x50@2x.png b/Installer/TrollInstaller2/Resources/AppIcon50x50@2x.png similarity index 100% rename from TrollInstaller2/Resources/AppIcon50x50@2x.png rename to Installer/TrollInstaller2/Resources/AppIcon50x50@2x.png diff --git a/TrollInstaller2/Resources/AppIcon57x57.png b/Installer/TrollInstaller2/Resources/AppIcon57x57.png similarity index 100% rename from TrollInstaller2/Resources/AppIcon57x57.png rename to Installer/TrollInstaller2/Resources/AppIcon57x57.png diff --git a/TrollInstaller2/Resources/AppIcon57x57@2x.png b/Installer/TrollInstaller2/Resources/AppIcon57x57@2x.png similarity index 100% rename from TrollInstaller2/Resources/AppIcon57x57@2x.png rename to Installer/TrollInstaller2/Resources/AppIcon57x57@2x.png diff --git a/TrollInstaller2/Resources/AppIcon57x57@3x.png b/Installer/TrollInstaller2/Resources/AppIcon57x57@3x.png similarity index 100% rename from TrollInstaller2/Resources/AppIcon57x57@3x.png rename to Installer/TrollInstaller2/Resources/AppIcon57x57@3x.png diff --git a/TrollInstaller2/Resources/AppIcon60x60.png b/Installer/TrollInstaller2/Resources/AppIcon60x60.png similarity index 100% rename from TrollInstaller2/Resources/AppIcon60x60.png rename to Installer/TrollInstaller2/Resources/AppIcon60x60.png diff --git a/TrollInstaller2/Resources/AppIcon60x60@2x.png b/Installer/TrollInstaller2/Resources/AppIcon60x60@2x.png similarity index 100% rename from TrollInstaller2/Resources/AppIcon60x60@2x.png rename to Installer/TrollInstaller2/Resources/AppIcon60x60@2x.png diff --git a/TrollInstaller2/Resources/AppIcon60x60@3x.png b/Installer/TrollInstaller2/Resources/AppIcon60x60@3x.png similarity index 100% rename from TrollInstaller2/Resources/AppIcon60x60@3x.png rename to Installer/TrollInstaller2/Resources/AppIcon60x60@3x.png diff --git a/TrollInstaller2/Resources/AppIcon72x72.png b/Installer/TrollInstaller2/Resources/AppIcon72x72.png similarity index 100% rename from TrollInstaller2/Resources/AppIcon72x72.png rename to Installer/TrollInstaller2/Resources/AppIcon72x72.png diff --git a/TrollInstaller2/Resources/AppIcon72x72@2x.png b/Installer/TrollInstaller2/Resources/AppIcon72x72@2x.png similarity index 100% rename from TrollInstaller2/Resources/AppIcon72x72@2x.png rename to Installer/TrollInstaller2/Resources/AppIcon72x72@2x.png diff --git a/TrollInstaller2/Resources/AppIcon76x76.png b/Installer/TrollInstaller2/Resources/AppIcon76x76.png similarity index 100% rename from TrollInstaller2/Resources/AppIcon76x76.png rename to Installer/TrollInstaller2/Resources/AppIcon76x76.png diff --git a/TrollInstaller2/Resources/AppIcon76x76@2x.png b/Installer/TrollInstaller2/Resources/AppIcon76x76@2x.png similarity index 100% rename from TrollInstaller2/Resources/AppIcon76x76@2x.png rename to Installer/TrollInstaller2/Resources/AppIcon76x76@2x.png diff --git a/TrollInstaller2/Resources/Info.plist b/Installer/TrollInstaller2/Resources/Info.plist similarity index 100% rename from TrollInstaller2/Resources/Info.plist rename to Installer/TrollInstaller2/Resources/Info.plist diff --git a/TrollInstaller2/Resources/LaunchImage-700-568h@2x.png b/Installer/TrollInstaller2/Resources/LaunchImage-700-568h@2x.png similarity index 100% rename from TrollInstaller2/Resources/LaunchImage-700-568h@2x.png rename to Installer/TrollInstaller2/Resources/LaunchImage-700-568h@2x.png diff --git a/TrollInstaller2/Resources/LaunchImage-700-Landscape@2x~ipad.png b/Installer/TrollInstaller2/Resources/LaunchImage-700-Landscape@2x~ipad.png similarity index 100% rename from TrollInstaller2/Resources/LaunchImage-700-Landscape@2x~ipad.png rename to Installer/TrollInstaller2/Resources/LaunchImage-700-Landscape@2x~ipad.png diff --git a/TrollInstaller2/Resources/LaunchImage-700-Landscape~ipad.png b/Installer/TrollInstaller2/Resources/LaunchImage-700-Landscape~ipad.png similarity index 100% rename from TrollInstaller2/Resources/LaunchImage-700-Landscape~ipad.png rename to Installer/TrollInstaller2/Resources/LaunchImage-700-Landscape~ipad.png diff --git a/TrollInstaller2/Resources/LaunchImage-700-Portrait@2x~ipad.png b/Installer/TrollInstaller2/Resources/LaunchImage-700-Portrait@2x~ipad.png similarity index 100% rename from TrollInstaller2/Resources/LaunchImage-700-Portrait@2x~ipad.png rename to Installer/TrollInstaller2/Resources/LaunchImage-700-Portrait@2x~ipad.png diff --git a/TrollInstaller2/Resources/LaunchImage-700-Portrait~ipad.png b/Installer/TrollInstaller2/Resources/LaunchImage-700-Portrait~ipad.png similarity index 100% rename from TrollInstaller2/Resources/LaunchImage-700-Portrait~ipad.png rename to Installer/TrollInstaller2/Resources/LaunchImage-700-Portrait~ipad.png diff --git a/TrollInstaller2/Resources/LaunchImage-800-667h@2x.png b/Installer/TrollInstaller2/Resources/LaunchImage-800-667h@2x.png similarity index 100% rename from TrollInstaller2/Resources/LaunchImage-800-667h@2x.png rename to Installer/TrollInstaller2/Resources/LaunchImage-800-667h@2x.png diff --git a/TrollInstaller2/Resources/LaunchImage-800-Landscape-736h@3x.png b/Installer/TrollInstaller2/Resources/LaunchImage-800-Landscape-736h@3x.png similarity index 100% rename from TrollInstaller2/Resources/LaunchImage-800-Landscape-736h@3x.png rename to Installer/TrollInstaller2/Resources/LaunchImage-800-Landscape-736h@3x.png diff --git a/TrollInstaller2/Resources/LaunchImage-800-Portrait-736h@3x.png b/Installer/TrollInstaller2/Resources/LaunchImage-800-Portrait-736h@3x.png similarity index 100% rename from TrollInstaller2/Resources/LaunchImage-800-Portrait-736h@3x.png rename to Installer/TrollInstaller2/Resources/LaunchImage-800-Portrait-736h@3x.png diff --git a/TrollInstaller2/Resources/LaunchImage.png b/Installer/TrollInstaller2/Resources/LaunchImage.png similarity index 100% rename from TrollInstaller2/Resources/LaunchImage.png rename to Installer/TrollInstaller2/Resources/LaunchImage.png diff --git a/TrollInstaller2/Resources/LaunchImage@2x.png b/Installer/TrollInstaller2/Resources/LaunchImage@2x.png similarity index 100% rename from TrollInstaller2/Resources/LaunchImage@2x.png rename to Installer/TrollInstaller2/Resources/LaunchImage@2x.png diff --git a/TrollInstaller2/TSI2AppDelegate.h b/Installer/TrollInstaller2/TSI2AppDelegate.h similarity index 100% rename from TrollInstaller2/TSI2AppDelegate.h rename to Installer/TrollInstaller2/TSI2AppDelegate.h diff --git a/TrollInstaller2/TSI2AppDelegate.m b/Installer/TrollInstaller2/TSI2AppDelegate.m similarity index 100% rename from TrollInstaller2/TSI2AppDelegate.m rename to Installer/TrollInstaller2/TSI2AppDelegate.m diff --git a/TrollInstaller2/TSI2RootViewController.h b/Installer/TrollInstaller2/TSI2RootViewController.h similarity index 100% rename from TrollInstaller2/TSI2RootViewController.h rename to Installer/TrollInstaller2/TSI2RootViewController.h diff --git a/TrollInstaller2/TSI2RootViewController.m b/Installer/TrollInstaller2/TSI2RootViewController.m similarity index 100% rename from TrollInstaller2/TSI2RootViewController.m rename to Installer/TrollInstaller2/TSI2RootViewController.m diff --git a/TrollInstaller2/TSI2SceneDelegate.h b/Installer/TrollInstaller2/TSI2SceneDelegate.h similarity index 100% rename from TrollInstaller2/TSI2SceneDelegate.h rename to Installer/TrollInstaller2/TSI2SceneDelegate.h diff --git a/TrollInstaller2/TSI2SceneDelegate.m b/Installer/TrollInstaller2/TSI2SceneDelegate.m similarity index 100% rename from TrollInstaller2/TSI2SceneDelegate.m rename to Installer/TrollInstaller2/TSI2SceneDelegate.m diff --git a/TrollInstaller2/control b/Installer/TrollInstaller2/control similarity index 72% rename from TrollInstaller2/control rename to Installer/TrollInstaller2/control index d9463c5..99de665 100644 --- a/TrollInstaller2/control +++ b/Installer/TrollInstaller2/control @@ -1,8 +1,8 @@ Package: com.opa334.trollinstaller2 Name: TrollInstaller2 -Version: 0.0.1 +Version: 2.0.0 Architecture: iphoneos-arm -Description: An awesome application! +Description: TrollInstaller v2! Maintainer: opa334 Author: opa334 Section: Utilities diff --git a/TrollInstaller2/entitlements.plist b/Installer/TrollInstaller2/entitlements.plist similarity index 100% rename from TrollInstaller2/entitlements.plist rename to Installer/TrollInstaller2/entitlements.plist diff --git a/TrollInstaller2/main.m b/Installer/TrollInstaller2/main.m similarity index 100% rename from TrollInstaller2/main.m rename to Installer/TrollInstaller2/main.m diff --git a/_compile/build_trollinstaller2.sh b/_compile/build_trollinstaller2.sh old mode 100755 new mode 100644 index 197a3a5..43f06ef --- a/_compile/build_trollinstaller2.sh +++ b/_compile/build_trollinstaller2.sh @@ -1,9 +1,17 @@ -cd ../TrollInstaller2 +#!/bin/sh +set -e + +if [ ! -d "./out" ] +then + mkdir -p ./out +fi + +cd ../Installer/TrollInstaller2 make clean make package cd - -lipo -thin arm64e ../TrollInstaller2/.theos/obj/debug/TrollInstaller2.app/TrollInstaller2 -output ./out/pwn_arm64e +lipo -thin arm64e ../Installer/TrollInstaller2/.theos/obj/debug/TrollInstaller2.app/TrollInstaller2 -output ./out/pwn_arm64e ldid -S -M -Kcert.p12 ./out/pwn_arm64e mkdir ./out/devpwn @@ -13,7 +21,7 @@ unzip target/Developer.ipa -d ./out/devpwn rm ./out/pwn_arm64e cd ./out/devpwn -zip -mvr devpwn.ipa * +zip -vr devpwn.ipa * cd - cp ./out/devpwn/devpwn.ipa ./out/DeveloperInstaller.ipa diff --git a/install_trollinstaller2.md b/install_trollinstaller2.md index b631734..71a0d42 100644 --- a/install_trollinstaller2.md +++ b/install_trollinstaller2.md @@ -1,6 +1,6 @@ # Installation through TrollInstaller 2 -**Supported devices:** A12-A15, 14.0 - 15.4.1 (15.5b4) +**Supported devices:** A12 - A15, 14.0 - 15.4.1 (15.5b4) ## Compiling pwned IPA (currently requires a Mac) (Needs [THEOS](https://theos.dev/docs/installation-macos) and [14.5 sdk](https://github.com/theos/sdks) installed)