nercone-shell 0.1.0__tar.gz → 0.2.1__tar.gz

{nercone_shell-0.1.0 → nercone_shell-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nercone-shell
-Version: 0.1.0
+Version: 0.2.1
 Summary: Modern shell for Developers
 Author: Nercone
 Author-email: Nercone <nercone@diamondgotcat.net>
@@ -8,7 +8,6 @@ License: MIT
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Dist: nercone-modern
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 

{nercone_shell-0.1.0 → nercone_shell-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "nercone-shell"
-version = "0.1.0"
+version = "0.2.1"
 description = "Modern shell for Developers"
 readme = { file = "README.md", content-type = "text/markdown" }
 authors = [
@@ -12,9 +12,7 @@ authors = [
 ]
 license = { text = "MIT" }
 requires-python = ">=3.8"
-dependencies = [
-    "nercone-modern"
-]
+dependencies = []
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",

{nercone_shell-0.1.0 → nercone_shell-0.2.1}/src/nercone_shell/__main__.py

@@ -1,13 +1,14 @@
 #!/usr/bin/env python3
 
 # -- nercone-shell ---------------------------------------------- #
-# __main__.py on nercone-shell                                    #
+# __main__.py on Nersh                                            #
 # Made by DiamondGotCat, Licensed under MIT License               #
 # Copyright (c) 2025 DiamondGotCat                                #
 # ---------------------------------------------- DiamondGotCat -- #
 
 import os
 import sys
+import re
 import json
 import glob
 import shutil
@@ -33,9 +34,6 @@ NERSH_CONFIG_DEFAULT: dict = {
     "override_env": {
         "SHELL": f"{shutil.which('nersh')}"
     },
-    "history": {
-        "path": f"{Path(NERSH_PATH, 'history.txt')}"
-    },
     "autoruns": [
         f"{Path(NERSH_PATH, 'autostart.sh')}"
     ]
@@ -77,7 +75,7 @@ class NershCompleter:
                         results.add(filename + " ")
             except (PermissionError, OSError):
                 continue
-        
+
         return sorted(list(results))
 
     def _complete_path(self, text):
@@ -160,7 +158,7 @@ def reload():
     ENVIRONMENT |= os.environ
     ENVIRONMENT |= NERSH_CONFIG.get("override_env", {})
 
-def load_config(filepath: str | Path = NERSH_CONFIG_PATH) -> dict:
+def load_config() -> dict:
     global NERSH_CONFIG
     NERSH_PATH.mkdir(parents=True, exist_ok=True)
     if not NERSH_CONFIG_PATH.is_file():
@@ -175,15 +173,21 @@ def load_config(filepath: str | Path = NERSH_CONFIG_PATH) -> dict:
     return NERSH_CONFIG
 
 def run_line(command: str) -> int:
+    def expand_vars(match):
+        key = match.group(1) or match.group(2)
+        return ENVIRONMENT.get(key, "")
+    if command.strip():
+        command = re.sub(r'\$(\w+)|\$\{(\w+)\}', expand_vars, command)
     args = command.strip().split(" ")
-    if args[0] == "cd":
+    cmd = args[0]
+    if cmd == "version":
+        print(f"Nersh v{VERSION}")
+    elif cmd == "cd":
         target = " ".join(args[1:])
         if not target:
             ENVIRONMENT["PWD"] = f"{Path("~").expanduser()}"
-
         target = os.path.expanduser(target)
         target_path = Path(target)
-
         if not target_path.is_absolute():
             target_path = Path(ENVIRONMENT["PWD"]) / target_path
         try:
@@ -196,7 +200,38 @@ def run_line(command: str) -> int:
                 print(f"Not exist: {target}")
         except FileNotFoundError:
             print(f"Not exist: {target}")
-    elif args[0] == "exit":
+    elif cmd == "export":
+        content = command.strip()[6:].strip()
+        if "=" in content:
+            key, value = content.split("=", 1)
+            if len(value) >= 2 and ((value[0] == '"' and value[-1] == '"') or (value[0] == "'" and value[-1] == "'")):
+                value = value[1:-1]
+            ENVIRONMENT[key] = value
+        else:
+            if not content:
+                for k, v in ENVIRONMENT.items():
+                    print(f"{k}={v}")
+    elif cmd == "source" or cmd == ".":
+        if len(args) < 2:
+            print(f"{cmd}: filename argument required")
+            return 1
+        target = args[1]
+        target_path = Path(os.path.expanduser(target))
+        if not target_path.is_absolute():
+            target_path = Path(ENVIRONMENT.get("PWD")) / target_path
+        if target_path.is_file():
+            try:
+                with target_path.open("r") as f:
+                    for line in f:
+                        if line.strip() and not line.strip().startswith("#"):
+                            run_line(line)
+            except Exception as e:
+                print(f"nersh: {e}")
+                return 1
+        else:
+            print(f"nersh: {target}: No such file")
+            return 1
+    elif cmd == "exit":
         readline.write_history_file(str(NERSH_HISTORY_PATH))
         try:
             raise SystemExit(int(args[1]))
@@ -219,6 +254,14 @@ def main() -> int:
     else:
         readline.parse_and_bind("tab: complete")
     readline.set_completer_delims(' \t\n;')
+    for p in NERSH_CONFIG.get("autoruns"):
+        if Path(p).is_file():
+            with Path(p).open("r") as f:
+                run_script(f.read())
+        elif Path(p).exists():
+            print(f"(autorun failed) Not a file: {p}")
+        else:
+            print(f"(autorun failed) Not exist: {p}")
     if NERSH_AUTORUN:
         run_script(NERSH_AUTORUN)
     if NERSH_HISTORY_PATH.is_file():