flyshell 1.1.4__tar.gz → 1.1.6__tar.gz

{flyshell-1.1.4/src/flyshell.egg-info → flyshell-1.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flyshell
-Version: 1.1.4
+Version: 1.1.6
 Summary: A modular, zero-dependency command-line environment in Python.
 License: MIT
 Requires-Python: >=3.10

{flyshell-1.1.4 → flyshell-1.1.6}/src/flyshell/abstract/parent_cmd.py

@@ -2,7 +2,7 @@
 
 from flyshell.abstract.base_cmd import BaseCmd
 
-from typing import Dict, List, Tuple, Union
+from typing import Dict, List, Tuple
 
 
 class ParentCmd(BaseCmd):

{flyshell-1.1.4 → flyshell-1.1.6}/src/flyshell/builtin/system.py

@@ -6,7 +6,6 @@ from flyshell.core import auth, data
 
 import getpass
 import os
-import re
 import shutil
 import subprocess
 

{flyshell-1.1.4 → flyshell-1.1.6}/src/flyshell/builtin/utils.py

@@ -81,8 +81,7 @@ class Kill(BaseCmd):
     def execute(self, args):
         choice = input("\nAre you sure [y/n]?: ").strip().lower()
         if choice == "y":
-            print("\nShutting down...")
-            sys.exit(0)
+            return (-1, "\nShutting down...\n")
         return (1, "\nAction cancelled.\n")
 
 

{flyshell-1.1.4 → flyshell-1.1.6}/src/flyshell/constants.py

@@ -5,8 +5,8 @@ import os
 import platform
 import time
 
-BUILD = 117
-VERSION = "1.1.4"
+BUILD = 119
+VERSION = "1.1.6"
 
 
 def _resolve_app_dir() -> Path:

{flyshell-1.1.4 → flyshell-1.1.6}/src/flyshell/core/auth.py

@@ -7,7 +7,6 @@ import getpass
 import hashlib
 import re
 import secrets
-import sys
 
 
 def hash_password(password, salt=None):
@@ -102,7 +101,7 @@ def login_flow(is_lock=False) -> bool:
         i -= 1
         print("\nAccount Error: Password does not match.")
         if i == 0:
-            print("Too many attempts.\n")
+            print("Too many attempts.")
             return False
         print(f"You have {i} attempts remaining.\n")
 
@@ -118,5 +117,4 @@ class Lock(BaseCmd):
         if login_flow(is_lock=True):
             return (0, "")
         else:
-            print("\nShutting down...\n")
-            sys.exit(0)
+            return (-1, "\nShutting down...\n")

{flyshell-1.1.4 → flyshell-1.1.6}/src/flyshell/core/directory.py

@@ -8,6 +8,7 @@ from flyshell.core import auth, data
 
 from datetime import datetime, timezone
 import shlex
+import sys
 
 
 class Cmds(BaseCmd):
@@ -145,14 +146,14 @@ def _execute_single(raw_cmd: str) -> int:
             code, message = result
             if message:
                 print(message)
+            if code == -1:
+                sys.exit(0)
+            elif code == -2:
+                sys.exit(1)
             return code
-        elif isinstance(result, int):
-            return result
-        elif isinstance(result, str):
-            if result:
-                print(result)
-            return 0
-        return 0
+        else:
+            print("\nCommand Error: Unknown exit code error occurred.\n")
+            return 1
     elif cmd_name in c.PLUGINS:
         log(raw_cmd)
         plugin = c.PLUGINS[cmd_name]

{flyshell-1.1.4 → flyshell-1.1.6}/src/flyshell/main.py

@@ -84,7 +84,7 @@ def main():
                 if auth.login_flow():
                     console.boot()
                 else:
-                    print("Shutting down...\n")
+                    print("\nShutting down...\n")
                     sys.exit(0)
             else:
                 print(

{flyshell-1.1.4 → flyshell-1.1.6/src/flyshell.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flyshell
-Version: 1.1.4
+Version: 1.1.6
 Summary: A modular, zero-dependency command-line environment in Python.
 License: MIT
 Requires-Python: >=3.10