remove exit on error, do that manually instead

ydoow · Aug 30, 2022 · a8da4ab · a8da4ab
1 parent 956835d
commit a8da4ab
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/permasigner/logger.py b/permasigner/logger.py
@@ -48,7 +48,6 @@ def debug(message, dbg):
 
 def error(message):
     print(colors["lightred"] + colors["bold"] + "[!] " + colors["reset"] + colors["lightred"] + f"{message}" + colors["reset"])
-    exit(1)
 
 
 def ask(message):

diff --git a/permasigner/permasigner.py b/permasigner/permasigner.py
@@ -81,6 +81,7 @@ def main(self) -> None:
             if self.args.url:
                 if not self.args.url.endswith(".ipa"):
                     logger.error("URL provided is not an IPA, make sure to provide a direct link.")
+                    exit(1)
 
                 print(f"Downloading IPA from {self.args.url}...")
                 save_path = self.download_ipa()
@@ -140,6 +141,7 @@ def permasign(self) -> Path:
         # then, exit with an error
         else:
             logger.error("Unable to find Info.plist, can't read application data")
+            exit(1)
 
         # Create directories in tmp dir
         logger.log(f"Making deb directories...", color=colors["yellow"])
@@ -263,8 +265,10 @@ def download_ipa(self) -> Path:
                     return save_path
             else:
                 logger.error(f"Provided URL is not reachable. Status code: {res.status_code}")
+                exit(1)
         except (NewConnectionError, ConnectionError, RequestException) as err:
             logger.error(f"Provided URL is not reachable. Error: {err}")
+            exit(1)
 
     def extract_ipa(self, src: Path) -> None:
         # Extracts ipa to folder in tmp

diff --git a/permasigner/sign.py b/permasigner/sign.py
@@ -145,6 +145,7 @@ def download(self) -> None:
                                color=colors["yellow"])
                 else:
                     logger.error('Download url is not reachable, and no ldid found in path, exiting.')
+                    exit(1)
             # If hashes do not match but the content is not empty, save it to a file
             else:
                 logger.debug(f"Ldid hash failed to verify, saving newer version", self.args.debug)

diff --git a/permasigner/utils.py b/permasigner/utils.py
@@ -111,8 +111,10 @@ def find_application_bundle(tmp: Path) -> Union[Path, str]:
 
         if bundle == '':
             logger.error("Did not find application bundle")
+            exit(1)
     else:
         logger.error(f"IPA/deb is not valid!")
+        exit(1)
 
     return bundle
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,6 @@ def debug(message, dbg): @@
     def error(message):
         print(colors["lightred"] + colors["bold"] + "[!] " + colors["reset"] + colors["lightred"] + f"{message}" + colors["reset"])
-        exit(1)
     def ask(message):
@@ Expand Down @@