chore: bump version to v1.2.3

fuck my life

README.md

@@ -14,7 +14,7 @@ you can open an issue to request a feature :D !! also see my [recommended flags]
 - remove UISupportedDevices
 - remove watch app
 - change the app icon
-- fakesign the output ipa/app
+- fakesign the output ipa/tipa/app
 - add custom entitlements to the main executable
 - thin all binaries to arm64, it can LARGELY reduce app size sometimes!
 - remove all app extensions (or just encrypted ones!)
@@ -48,8 +48,6 @@ the `zip` and `unzip` commands are *optional* dependencies, they may [fix issues
 </ol>
 </details>
 
-note: if you installed cyan before v1.1.3 using `pip`, make sure you `pip uninstall cyan`, then verify you have the latest version with `cyan --version`
-
 ## making cyan files
 
 cyan comes bundled with the `cgen` command, which lets you generate `.cyan` files to pass to `-z`/`--cyan` !

cyan/__main__.py

@@ -99,7 +99,7 @@ def main() -> None:
   )
 
   parser.add_argument(
-    "--version", action="version", version="cyan v1.2"
+    "--version", action="version", version="cyan v1.2.3"
   )
 
   from cyan import logic

cyan/extras/Orion.framework/Info.plist

@@ -12,7 +12,7 @@
 	<string>Orion</string>
 	
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>1.0.2</string>
 	
 	<key>CFBundleVersion</key>
 	<string>1</string>

cyan/logic.py

@@ -13,8 +13,12 @@ def main(parser: ArgumentParser) -> None:
 
   if args.output is not None:
     args.o = os.path.normpath(args.output)
-    if not (args.o.endswith(".app") or args.o.endswith(".ipa")):
-      print("[?] output's file extension not specified; will create ipa")
+    if not (
+        args.o.endswith(".app")
+        or args.o.endswith(".ipa")
+        or args.o.endswith(".tipa")
+    ):
+      print("[?] valid file extension not found; will create ipa")
       args.o += ".ipa"
   else:
     args.o = args.i
@@ -25,8 +29,9 @@ def main(parser: ArgumentParser) -> None:
   if arg_err is not None:
     parser.error(arg_err)
 
-  INPUT_IS_IPA = True if args.i.endswith(".ipa") else False
-  OUTPUT_IS_IPA = True if args.o.endswith(".ipa") else False
+  # mfw when "True if True else False" HAHAHAH
+  INPUT_IS_IPA = args.i.endswith(".ipa") or args.i.endswith(".tipa")
+  OUTPUT_IS_IPA = args.o.endswith(".ipa") or args.o.endswith(".tipa")
 
   with TemporaryDirectory() as tmpdir, tbhtypes.LeavingCM():
     app_path = tbhutils.get_app(args.i, tmpdir, INPUT_IS_IPA)
@@ -61,8 +66,8 @@ def main(parser: ArgumentParser) -> None:
       app.plist.change_minimum_version(args.m)
     if args.k is not None:
       app.change_icon(args.k, tmpdir)
-    if args.x is not None:  # `validate_inputs()` made it a dict
-      app.executable.merge_entitlements(args.x, tmpdir)
+    if args.x is not None:
+      app.executable.merge_entitlements(args.x)
 
     if args.remove_supported_devices:
       app.plist.remove_uisd()

cyan/tbhtypes/main_executable.py

@@ -1,9 +1,6 @@
 import os
 import shutil
-import plistlib
 import subprocess
-from typing import Any
-from plistlib import dump as pdump
 
 from cyan import tbhutils
 from .executable import Executable
@@ -98,27 +95,12 @@ class MainExecutable(Executable):
       self.sign_with_entitlements(ENT_PATH)
       print("[*] restored entitlements")
 
-  def merge_entitlements(
-      self, entitlements: dict[str, Any], tmpdir: str
-  ) -> None:
-    ENT_PATH = f"{tmpdir}/new.entitlements"
-    existing: dict[str, Any]
-
-    if self.write_entitlements(ENT_PATH):  # has entitlements
-      with open(ENT_PATH, "rb") as f:
-        existing = plistlib.load(f)
-    else:
-      existing = {}
-
-    new = existing | entitlements
-    with open(ENT_PATH, "wb") as f2:
-      pdump(new, f2)
-
-    self.sign_with_entitlements(ENT_PATH)
-    print("[*] modified entitlement keys:", ", ".join(entitlements))
+  def merge_entitlements(self, entitlements: str) -> None:
+    self.sign_with_entitlements(entitlements)
+    print("[*] merged new entitlements")
 
   def sign_with_entitlements(self, entitlements: str) -> bool:
     return subprocess.run(
-      [self.ldid, f"-S{entitlements}", self.path]
+      [self.ldid, f"-S{entitlements}", "-M", self.path]
     ).returncode == 0
 

cyan/tbhutils.py

@@ -17,10 +17,11 @@ HAS_UNZIP = shutil.which("unzip") is not None
 
 def validate_inputs(args: Namespace) -> Optional[str]:
   if not (
-      args.i.endswith(".ipa")
-      or args.i.endswith(".app")
+      args.i.endswith(".app")
+      or args.i.endswith(".ipa")
+      or args.i.endswith(".tipa")
   ):
-    return "the input file must be an ipa/app"
+    return "the input file must be an ipa/tipa/app"
 
   if not os.path.exists(args.i):
     return f"{args.i} does not exist"
@@ -75,7 +76,7 @@ def validate_inputs(args: Namespace) -> Optional[str]:
 
     try:
       with open(args.x, "rb") as f:
-        args.x = pload(f)
+        pload(f)
     except Exception:
       sys.exit("[!] couldn't parse given entitlements file")
 
@@ -208,8 +209,10 @@ def make_ipa(tmpdir: str, output: str, level: int) -> None:
     except FileNotFoundError:
       pass
 
+    # don't zip hidden files to fix an installd error sometimes
+    # thanks a lot eevee 😭
     subprocess.run(
-      ["zip", f"-{level}", "-r", output, "Payload"],
+      ["zip", f"-{level}", "-r", output, "Payload", "-x", "*/.*"],
       stdout=subprocess.DEVNULL
     )
   else:

setup.py

@@ -4,7 +4,7 @@ from setuptools import setup
 
 setup(
   name="cyan",
-  version="1.2",
+  version="1.2.3",
   description="finally, pyzule doesn't suck",
   author="zx",
   author_email="zx@hrzn.email",