machineconfig 1.95__py3-none-any.whl → 1.96__py3-none-any.whl

machineconfig/jobs/python_linux_installers/config.json

@@ -2,8 +2,12 @@
   "speedtest": {
     "repo_url": "https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-linux-x86_64.tgz",
     "doc": "🚀 Test your internet connection speed and ping using speedtest.net from the CLI",
-    "filename_template_windows_amd_64": "speedtest",
-    "filename_template_linux_amd_64": "speedtest",
+    "filename_template_windows_amd_64": "https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-win64.zip",
+    "filename_template_windows_arm_64": "",
+    "filename_template_linux_amd_64": "https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-linux-x86_64.tgz",
+    "filename_template_linux_arm_64": "https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-linux-aarch64.tgz",
+    "filename_template_macos_amd_64": "https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-macosx-x86_64.tgz",
+    "filename_template_macos_arm_64": "https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-macosx-universal.tgz",
     "strip_v": false,
     "exe_name": "speedtest"
   },
@@ -11,7 +15,11 @@
     "repo_url": "https://github.com/doronbehar/pistol",
     "doc": "👁️ file previewer.",
     "filename_template_windows_amd_64": "",
+    "filename_template_windows_arm_64": "",
     "filename_template_linux_amd_64": "pistol-static-linux-x86_64",
+    "filename_template_linux_arm_64": "pistol-static-linux-aarch64",
+    "filename_template_macos_amd_64": "",
+    "filename_template_macos_arm_64": "",
     "strip_v": true,
     "exe_name": "pistol"
   },
@@ -19,7 +27,11 @@
     "repo_url": "curl -sL https://aka.ms/DevTunnelCliInstall | bash",
     "doc": "🔄 devtunnel secure introspectable tunnels to localhost",
     "filename_template_windows_amd_64": "",
+    "filename_template_windows_arm_64": "",
     "filename_template_linux_amd_64": "",
+    "filename_template_linux_arm_64": "",
+    "filename_template_macos_amd_64": "",
+    "filename_template_macos_arm_64": "",
     "strip_v": false,
     "exe_name": "devtunnel"
   },
@@ -27,7 +39,11 @@
     "repo_url": "https://github.com/imsnif/diskonaut",
     "doc": "💾 like dua, diskonaut is a terminal disk space navigator.",
     "filename_template_windows_amd_64": "",
+    "filename_template_windows_arm_64": "",
     "filename_template_linux_amd_64": "diskonaut-{}-unknown-linux-musl.tar.gz",
+    "filename_template_linux_arm_64": "",
+    "filename_template_macos_amd_64": "",
+    "filename_template_macos_arm_64": "",
     "strip_v": true,
     "exe_name": "diskonaut"
   },
@@ -35,39 +51,59 @@
       "repo_url": "https://github.com/sayanarijit/xplr",
       "doc": "📂 A terminal file explorer with vi keybindings",
       "filename_template_windows_amd_64": "",
+      "filename_template_windows_arm_64": "",
       "filename_template_linux_amd_64": "xplr-linux.tar.gz",
+      "filename_template_linux_arm_64": "xplr-linux-aarch64.tar.gz",
+      "filename_template_macos_amd_64": "xplr-macos.tar.gz",
+      "filename_template_macos_arm_64": "xplr-macos.tar.gz",
       "strip_v": false,
       "exe_name": "xplr"
   },
     "btop": {
       "repo_url": "https://github.com/aristocratos/btop",
       "doc": "📊 btop is a resource monitor for Linux, FreeBSD and MacOS.",
-      "filename_template_linux_amd_64": "btop-x86_64-linux-musl.tbz",
       "filename_template_windows_amd_64": "",
+      "filename_template_windows_arm_64": "",
+      "filename_template_linux_amd_64": "btop-x86_64-linux-musl.tbz",
+      "filename_template_linux_arm_64": "btop-aarch64-linux-musl.tbz",
+      "filename_template_macos_amd_64": "",
+      "filename_template_macos_arm_64": "",
       "strip_v": false,
       "exe_name": "btop"
     },
     "gotty": {
       "repo_url": "https://github.com/sorenisanerd/gotty",
       "doc": "🌐 gotty is a simple command line tool that turns your CLI tools into web applications.",
-      "filename_template_linux_amd_64": "gotty_{}_linux_amd64.tar.gz",
       "filename_template_windows_amd_64": "",
+      "filename_template_windows_arm_64": "",
+      "filename_template_linux_amd_64": "gotty_{}_linux_amd64.tar.gz",
+      "filename_template_linux_arm_64": "gotty_{}_linux_arm64.tar.gz",
+      "filename_template_macos_amd_64": "gotty_{}_darwin_amd64.tar.gz",
+      "filename_template_macos_arm_64": "gotty_{}_darwin_arm64.tar.gz",
       "strip_v": false,
       "exe_name": "gotty"
     },
     "joshuto": {
       "repo_url": "https://github.com/kamiyaa/joshuto",
       "doc": "📂 A terminal file manager written in Rust.",
-      "filename_template_linux_amd_64": "joshuto-{}-x86_64-unknown-linux-musl.tar.gz",
       "filename_template_windows_amd_64": "",
+      "filename_template_windows_arm_64": "",
+      "filename_template_linux_amd_64": "joshuto-{}-x86_64-unknown-linux-musl.tar.gz",
+      "filename_template_linux_arm_64": "joshuto-{}-aarch64-unknown-linux-musl.tar.gz",
+      "filename_template_macos_amd_64": "joshuto-{}-x86_64-apple-darwin.tar.gz",
+      "filename_template_macos_arm_64": "joshuto-{}-aarch64-apple-darwin.tar.gz",
       "strip_v": false,
       "exe_name": "joshuto"
     },
     "zellij": {
       "repo_url": "https://github.com/zellij-org/zellij",
       "doc": "🖥️ Zellij is a terminal workspace with support for multiple plugins, such as a terminal, status bar, tabs, splits, etc.",
-      "filename_template_linux_amd_64": "zellij-x86_64-unknown-linux-musl.tar.gz",
       "filename_template_windows_amd_64": "",
+      "filename_template_windows_arm_64": "",
+      "filename_template_linux_amd_64": "zellij-x86_64-unknown-linux-musl.tar.gz",
+      "filename_template_linux_arm_64": "zellij-aarch64-unknown-linux-musl.tar.gz",
+      "filename_template_macos_amd_64": "zellij-x86_64-apple-darwin.tar.gz",
+      "filename_template_macos_arm_64": "zellij-aarch64-apple-darwin.tar.gz",
       "strip_v": false,
       "exe_name": "zellij"
     }

machineconfig/jobs/python_linux_installers/dev/config.json

@@ -3,7 +3,11 @@
         "repo_url": "https://github.com/sudipghimire533/ytui-music",
         "doc": "🎵 A terminal based YouTube music player written in Rust.",
         "filename_template_windows_amd_64": "",
+        "filename_template_windows_arm_64": "",
         "filename_template_linux_amd_64": "ytui_music-linux-amd64",
+        "filename_template_linux_arm_64": "",
+        "filename_template_macos_amd_64": "",
+        "filename_template_macos_arm_64": "",
         "strip_v": true,
         "exe_name": "ytui-music"
     },
@@ -11,7 +15,11 @@
         "repo_url": "https://github.com/Siriusmart/youtube-tui",
         "doc": "🎵 A terminal based YouTube music player written in Rust.",
         "filename_template_windows_amd_64": "",
+        "filename_template_windows_arm_64": "",
         "filename_template_linux_amd_64": "youtube-tui-full_arch-x86_64",
+        "filename_template_linux_arm_64": "",
+        "filename_template_macos_amd_64": "",
+        "filename_template_macos_arm_64": "",
         "strip_v": true,
         "exe_name": "youtube-tui"
     },
@@ -19,7 +27,11 @@
         "repo_url": "https://github.com/tramhao/termusic",
         "doc": "🎵 A terminal-based music player written in Rust.",
         "filename_template_windows_amd_64": "termusic-{}-x86_64-windows.zip",
+        "filename_template_windows_arm_64": "",
         "filename_template_linux_amd_64": "termusic-{}-x86_64-linux.tar.xz",
+        "filename_template_linux_arm_64": "",
+        "filename_template_macos_amd_64": "termusic-{}-x86_64-macos.tar.xz",
+        "filename_template_macos_arm_64": "",
         "strip_v": false,
         "exe_name": "termusic"
     },
@@ -27,15 +39,23 @@
         "repo_url": "https://github.com/TrevorSatori/kronos",
         "doc": "🎵 A Customizable Terminal Music Player For Offline Listening",
         "filename_template_windows_amd_64": "",
+        "filename_template_windows_arm_64": "",
         "filename_template_linux_amd_64": "Kronos",
+        "filename_template_linux_arm_64": "",
+        "filename_template_macos_amd_64": "",
+        "filename_template_macos_arm_64": "",
         "strip_v": true,
         "exe_name": "kronos"
     },
     "transmission": {
         "repo_url": "https://github.com/transmission/transmission",
         "doc": "📥 A fast, easy, and free BitTorrent client.",
-        "filename_template_windows_amd_64": "",
+        "filename_template_windows_amd_64": "transmission-{}-x64.msi",
+        "filename_template_windows_arm_64": "",
         "filename_template_linux_amd_64": "transmission-{}.tar.xz",
+        "filename_template_linux_arm_64": "",
+        "filename_template_macos_amd_64": "Transmission-{}.dmg",
+        "filename_template_macos_arm_64": "Transmission-{}.dmg",
         "strip_v": true,
         "exe_name": "transmission"
     },
@@ -43,7 +63,11 @@
         "repo_url": "https://github.com/jarun/nnn",
         "doc": "📂 A terminal-based file manager.",
         "filename_template_windows_amd_64": "",
-        "filename_template_linux_amd_64": "nnn-{}.tar.gz",
+        "filename_template_windows_arm_64": "",
+        "filename_template_linux_amd_64": "",
+        "filename_template_linux_arm_64": "",
+        "filename_template_macos_amd_64": "",
+        "filename_template_macos_arm_64": "",
         "strip_v": false,
         "exe_name": "nnn"
       },
@@ -51,7 +75,11 @@
         "repo_url": "https://github.com/ogham/exa",
         "doc": "📂 A modern replacement for ls. lsd alternative.",
         "filename_template_windows_amd_64": "",
+        "filename_template_windows_arm_64": "",
         "filename_template_linux_amd_64": "exa-linux-x86_64-{}.zip",
+        "filename_template_linux_arm_64": "exa-linux-armv7-{}.zip",
+        "filename_template_macos_amd_64": "exa-macos-x86_64-{}.zip",
+        "filename_template_macos_arm_64": "",
         "strip_v": false,
         "exe_name": "exa"
     },
@@ -59,7 +87,11 @@
         "repo_url": "https://github.com/koute/bytehound",
         "doc": "🔍 Inspecting the memory usage of a running process",
         "filename_template_windows_amd_64": "",
+        "filename_template_windows_arm_64": "",
         "filename_template_linux_amd_64": "bytehound-x86_64-unknown-linux-gnu.tgz",
+        "filename_template_linux_arm_64": "",
+        "filename_template_macos_amd_64": "",
+        "filename_template_macos_arm_64": "",
         "strip_v": false,
         "exe_name": "bytehound"
       },
@@ -67,7 +99,11 @@
         "repo_url": "https://github.com/atuinsh/atuin",
         "doc": "🔍 Shell history search tool. Mcfly alternative",
         "filename_template_windows_amd_64": "",
-        "filename_template_linux_amd_64": "atuin-x86_64-unknown-linux-musl.tar.gz",
+        "filename_template_windows_arm_64": "",
+        "filename_template_linux_amd_64": "atuin-x86_64-unknown-linux-gnu.tar.gz",
+        "filename_template_linux_arm_64": "atuin-aarch64-unknown-linux-gnu.tar.gz",
+        "filename_template_macos_amd_64": "atuin-x86_64-apple-darwin.tar.gz",
+        "filename_template_macos_arm_64": "atuin-aarch64-apple-darwin.tar.gz",
         "strip_v": false,
         "exe_name": "atuin"
     },
@@ -75,31 +111,47 @@
         "repo_url": "https://github.com/browsh-org/browsh",
         "doc": "🌐 browser in the shell",
         "filename_template_windows_amd_64": "browsh_{}_windows_amd64.exe",
-        "filename_template_linux_amd_64": "browsh-{}.xpi",
+        "filename_template_windows_arm_64": "browsh_{}_windows_arm64.exe",
+        "filename_template_linux_amd_64": "browsh_{}_linux_amd64",
+        "filename_template_linux_arm_64": "browsh_{}_linux_arm64",
+        "filename_template_macos_amd_64": "browsh_{}_darwin_amd64",
+        "filename_template_macos_arm_64": "browsh_{}_darwin_arm64",
         "strip_v": true,
         "exe_name": "browsh"
     },
     "carbonyl": {
         "repo_url": "https://github.com/fathyb/carbonyl",
-        "doc": "🌐 Brwoser in terminal. Browsh alternative.",
+        "doc": "A Chromium based browser built to run in a terminal",
         "filename_template_windows_amd_64": "",
-        "filename_template_linux_amd_64": "carbonyl.linux-amd64.zip",
-        "strip_v": false,
+        "filename_template_windows_arm_64": "",
+        "filename_template_linux_amd_64": "carbonyl.linux-x86_64.zip",
+        "filename_template_linux_arm_64": "carbonyl.linux-arm64.zip",
+        "filename_template_macos_amd_64": "carbonyl.macos-x86_64.zip",
+        "filename_template_macos_arm_64": "carbonyl.macos-arm64.zip",
+        "strip_v": true,
         "exe_name": "carbonyl"
     },
     "patat": {
         "repo_url": "https://github.com/jaspervdj/patat",
         "doc": "🎯 Terminal-based presentations using Pandoc. Presenterm alternative.",
         "filename_template_windows_amd_64": "",
+        "filename_template_windows_arm_64": "",
         "filename_template_linux_amd_64": "patat-{}-linux-x86_64.tar.gz",
+        "filename_template_linux_arm_64": "",
+        "filename_template_macos_amd_64": "",
+        "filename_template_macos_arm_64": "patat-{}-darwin-arm64.zip",
         "strip_v": false,
         "exe_name": "patat"
     },
     "SqliteBrowser": {
         "repo_url": "https://github.com/sqlitebrowser/sqlitebrowser",
         "doc": "🗃️ A visual tool to create, design, and edit database files compatible with SQLite.",
-        "filename_template_windows_amd_64": "sqlitebrowser-{}-win64.zip",
-        "filename_template_linux_amd_64": "DB_Browser_for_SQLite-{}-x86_64.AppImage",
+        "filename_template_windows_amd_64": "DB.Browser.for.SQLite-{}-win64.zip",
+        "filename_template_windows_arm_64": "",
+        "filename_template_linux_amd_64": "DB.Browser.for.SQLite-{}-x86.64-v2.AppImage",
+        "filename_template_linux_arm_64": "",
+        "filename_template_macos_amd_64": "DB.Browser.for.SQLite-{}.dmg",
+        "filename_template_macos_arm_64": "DB.Browser.for.SQLite-{}.dmg",
         "strip_v": false,
         "exe_name": "sqlite_browser"
     },
@@ -107,7 +159,11 @@
         "repo_url": "https://github.com/dbeaver/dbeaver",
         "doc": "🗃️ Free universal database tool and SQL client.",
         "filename_template_windows_amd_64": "dbeaver-ce-{}-win32.win32.x86_64.zip",
+        "filename_template_windows_arm_64": "",
         "filename_template_linux_amd_64": "dbeaver-ce-{}-linux.gtk.x86_64.tar.gz",
+        "filename_template_linux_arm_64": "dbeaver-ce-{}-linux.gtk.aarch64.tar.gz",
+        "filename_template_macos_amd_64": "dbeaver-ce-{}-macos-cocoa.x86_64.tar.gz",
+        "filename_template_macos_arm_64": "dbeaver-ce-{}-macos-cocoa.aarch64.tar.gz",
         "strip_v": true,
         "exe_name": "dbeaver"
     },
@@ -115,23 +171,35 @@
         "repo_url": "https://github.com/achristmascarl/rainfrog",
         "doc": "🗃️ TUI DB Visualizer",
         "filename_template_windows_amd_64": "rainfrog-{}-x86_64-pc-windows-msvc.tar.gz",
+        "filename_template_windows_arm_64": "rainfrog-{}-aarch64-pc-windows-msvc.tar.gz",
         "filename_template_linux_amd_64": "rainfrog-{}-x86_64-unknown-linux-musl.tar.gz",
+        "filename_template_linux_arm_64": "rainfrog-{}-aarch64-unknown-linux-musl.tar.gz",
+        "filename_template_macos_amd_64": "rainfrog-{}-x86_64-apple-darwin.tar.gz",
+        "filename_template_macos_arm_64": "rainfrog-{}-aarch64-apple-darwin.tar.gz",
         "strip_v": false,
         "exe_name": "rainfrog"
     },
     "cpz": {
         "repo_url": "https://github.com/SUPERCILEX/fuc",
         "doc": "📋 Fast copy",
-        "filename_template_windows_amd_64": "cpz-{}-windows.zip",
+        "filename_template_windows_amd_64": "x86_64-pc-windows-msvc-cpz.exe",
+        "filename_template_windows_arm_64": "aarch64-pc-windows-msvc-cpz.exe",
         "filename_template_linux_amd_64": "x86_64-unknown-linux-musl-cpz",
+        "filename_template_linux_arm_64": "aarch64-unknown-linux-gnu-cpz",
+        "filename_template_macos_amd_64": "x86_64-apple-darwin-cpz",
+        "filename_template_macos_arm_64": "aarch64-apple-darwin-cpz",
         "strip_v": true,
         "exe_name": "cpz"
     },
     "rmz": {
         "repo_url": "https://github.com/SUPERCILEX/fuc",
         "doc": "🗑️ Fast remove",
-        "filename_template_windows_amd_64": "rmz-{}-windows.zip",
+        "filename_template_windows_amd_64": "x86_64-pc-windows-msvc-rmz.exe",
+        "filename_template_windows_arm_64": "aarch64-pc-windows-msvc-rmz.exe",
         "filename_template_linux_amd_64": "x86_64-unknown-linux-musl-rmz",
+        "filename_template_linux_arm_64": "aarch64-unknown-linux-gnu-rmz",
+        "filename_template_macos_amd_64": "x86_64-apple-darwin-rmz",
+        "filename_template_macos_arm_64": "aarch64-apple-darwin-rmz",
         "strip_v": true,
         "exe_name": "rmz"
     }

machineconfig/jobs/python_windows_installers/config.json

@@ -3,6 +3,7 @@
         "repo_url": "https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-win64.zip",
         "doc": "🚀 Test your internet connection speed and ping using speedtest.net from the CLI",
         "filename_template_windows_amd_64": "speedtest",
+        "filename_template_windows_arm_64": "speedtest",
         "filename_template_linux_amd_64": "speedtest",
         "strip_v": false,
         "exe_name": "speedtest"
@@ -11,6 +12,7 @@
         "repo_url": "https://github.com/ascii-boxes/boxes",
         "doc": "📦 ASCI draws boxes around text.",
         "filename_template_windows_amd_64": "boxes-{}-intel-win32.zip",
+        "filename_template_windows_arm_64": "",
         "filename_template_linux_amd_64": "",
         "strip_v": true,
         "exe_name": "boxes"
@@ -19,6 +21,7 @@
         "repo_url": "https://github.com/Genivia/ugrep",
         "doc": "🔍 A fast, portable, feature-rich command-line search tool",
         "filename_template_windows_amd_64": "ugrep-windows-x64.zip",
+        "filename_template_windows_arm_64": "",
         "filename_template_linux_amd_64": "",
         "strip_v": true,
         "exe_name": "ugrep"
@@ -27,6 +30,7 @@
         "repo_url": "https://download.sysinternals.com/files/ZoomIt.zip",
         "doc": "🔍 A screen zoom and annotation tool for presentations",
         "filename_template_windows_amd_64": "",
+        "filename_template_windows_arm_64": "",
         "filename_template_linux_amd_64": "",
         "strip_v": false,
         "exe_name": "ZoomIt.exe"
@@ -35,6 +39,7 @@
         "repo_url": "https://github.com/gsass1/NTop",
         "doc": "📊 Like htop, for Windows",
         "filename_template_windows_amd_64": "ntop.exe",
+        "filename_template_windows_arm_64": "",
         "filename_template_linux_amd_64": "",
         "strip_v": false,
         "exe_name": "ntop.exe"
@@ -43,6 +48,7 @@
         "repo_url": "winget install --Id Microsoft.devtunnel --scope user",
         "doc": "🔄 devtunnel secure introspectable tunnels to localhost",
         "filename_template_windows_amd_64": "",
+        "filename_template_windows_arm_64": "",
         "filename_template_linux_amd_64": "",
         "strip_v": false,
         "exe_name": "devtunnel"

machineconfig/profile/create.py

@@ -5,17 +5,17 @@ This script Takes away all config files from the computer, place them in one dir
 """
 
 
-from crocodile.environment import system  # ProgramFiles, WindowsApps  # , exe
 from crocodile.meta import Terminal
-from crocodile.file_management import P
+from machineconfig.utils.path_reduced import P as PathExtended
 from machineconfig.utils.utils import symlink_func, symlink_copy, LIBRARY_ROOT, REPO_ROOT, display_options
 from machineconfig.profile.shell import create_default_shell_profile
 # import os
+import platform
 import subprocess
 from rich.console import Console
 from typing import Optional, Any, TypedDict
 
-
+system = platform.system()  # Linux or Windows
 ERROR_LIST: list[Any] = []  # append to this after every exception captured.
 CONFIG_ROOT = LIBRARY_ROOT.parent.parent.joinpath("settings")
 OTHER_SYSTEM = "windows" if system == "Linux" else "linux"
@@ -74,8 +74,8 @@ def main_symlinks(choice: Optional[str] = None):
     for program_key in program_keys:
         print(f"\n🔄 Processing {program_key} symlinks...")
         for file_key, file_map in symlink_mapper[program_key].items():
-            this = P(file_map['this'])
-            to_this = P(file_map['to_this'].replace("REPO_ROOT", REPO_ROOT.as_posix()).replace("LIBRARY_ROOT", LIBRARY_ROOT.as_posix()))
+            this = PathExtended(file_map['this'])
+            to_this = PathExtended(file_map['to_this'].replace("REPO_ROOT", REPO_ROOT.as_posix()).replace("LIBRARY_ROOT", LIBRARY_ROOT.as_posix()))
             if "contents" in file_map:
                 try:
                     for a_target in to_this.expanduser().search("*"):

machineconfig/profile/create_hardlinks.py

@@ -5,9 +5,9 @@ This script Takes away all config files from the computer, place them in one dir
 """
 
 
-from crocodile.environment import system  # ProgramFiles, WindowsApps  # , exe
+import platform
 from crocodile.meta import Terminal
-from crocodile.file_management import P
+from machineconfig.utils.path_reduced import P as PathExtended
 from machineconfig.utils.utils import symlink_copy as symlink_func, LIBRARY_ROOT, REPO_ROOT, display_options
 from machineconfig.profile.shell import create_default_shell_profile
 # import os
@@ -15,7 +15,7 @@ import subprocess
 from rich.console import Console
 from typing import Optional, Any
 
-
+system = platform.system()  # Linux or Windows
 ERROR_LIST: list[Any] = []  # append to this after every exception captured.
 CONFIG_ROOT = LIBRARY_ROOT.parent.parent.joinpath("settings")
 OTHER_SYSTEM = "windows" if system == "Linux" else "linux"
@@ -63,8 +63,8 @@ def main_symlinks(choice: Optional[str] = None):
     for program_key in program_keys:
         print(f"\n🔄 Creating hardlinks for {program_key}...")
         for file_key, file_map in symlink_mapper[program_key].items():
-            this = P(file_map['this'])
-            to_this = P(file_map['to_this'].replace("REPO_ROOT", REPO_ROOT.as_posix()).replace("LIBRARY_ROOT", LIBRARY_ROOT.as_posix()))
+            this = PathExtended(file_map['this'])
+            to_this = PathExtended(file_map['to_this'].replace("REPO_ROOT", REPO_ROOT.as_posix()).replace("LIBRARY_ROOT", LIBRARY_ROOT.as_posix()))
             if "contents" in file_map:
                 try:
                     for a_target in to_this.expanduser().search("*"):

machineconfig/profile/shell.py

@@ -1,19 +1,20 @@
 """shell
 """
 
-from crocodile.environment import PathVar
-from crocodile.core import randstr
-from crocodile.file_management import P
+from machineconfig.utils.utils2 import randstr
+from machineconfig.utils.path_reduced import P as PathExtended, modify_text
 from crocodile.meta import Terminal
 from machineconfig.utils.utils import LIBRARY_ROOT, REPO_ROOT, display_options
 import platform
-from typing import Optional
+import os
+from typing import Literal, Optional
 from rich.console import Console
 from rich.panel import Panel
 
 
 system = platform.system()
-
+sep = ";" if system == "Windows" else ":"  # PATH separator, this is special for PATH object, not to be confused with PathExtended.sep (normal paths), usually / or \
+PATH = os.environ["PATH"].split(sep)  # this is a list of paths in PATH variable, not a crocodile.file_management.P object.
 console = Console()
 BOX_WIDTH = 100  # Define BOX_WIDTH or get it from a config
 
@@ -26,8 +27,8 @@ BOX_WIDTH = 100  # Define BOX_WIDTH or get it from a config
 def create_default_shell_profile():
     profile_path = get_shell_profile_path()
     profile = profile_path.read_text()
-    if system == "Windows": source = f". {LIBRARY_ROOT.joinpath('settings/shells/pwsh/init.ps1').collapseuser().to_str().replace('~', '$HOME')}"
-    else: source = f"source {LIBRARY_ROOT.joinpath('settings/shells/bash/init.sh').collapseuser().to_str().replace('~', '$HOME')}"
+    if system == "Windows": source = f". {str(LIBRARY_ROOT.joinpath('settings/shells/pwsh/init.ps1').collapseuser()).replace('~', '$HOME')}"
+    else: source = f"source {str(LIBRARY_ROOT.joinpath('settings/shells/bash/init.sh').collapseuser()).replace('~', '$HOME')}"
 
     if source in profile: 
         console.print(Panel("🔄 PROFILE | Skipping init script sourcing - already present in profile", title="[bold blue]Profile[/bold blue]", border_style="blue"))
@@ -39,7 +40,8 @@ def create_default_shell_profile():
             if "microsoft" in res.lower() or "wsl" in res.lower():
                 profile += "\ncd ~"  # this is to make sure that the current dir is not in the windows file system, which is terribly slow and its a bad idea to be there anyway.
                 console.print("📌 WSL detected - adding 'cd ~' to profile to avoid Windows filesystem")
-        profile_path.create(parents_only=True).write_text(profile)
+        profile_path.parent.mkdir(parents=True, exist_ok=True)
+        profile_path.write_text(profile)
         console.print(Panel("✅ Profile updated successfully", title="[bold blue]Profile[/bold blue]", border_style="blue"))
 
 
@@ -47,16 +49,38 @@ def get_shell_profile_path():
     if system == "Windows":
         obj = Terminal().run("$PROFILE", shell="pwsh")
         res = obj.op2path()
-        if isinstance(res, P): profile_path = res
+        if isinstance(res, PathExtended): profile_path = res
         else:
             obj.print(capture=False)
             raise ValueError(f"Could not get profile path for Windows. Got {res}")
-    elif system == "Linux": profile_path = P("~/.bashrc").expanduser()
+    elif system == "Linux": profile_path = PathExtended("~/.bashrc").expanduser()
     else: raise ValueError(f"Not implemented for this system {system}")
     console.print(Panel(f"🐚 SHELL PROFILE | Working with path: `{profile_path}`", title="[bold blue]Shell Profile[/bold blue]", border_style="blue"))
     return profile_path
 
 
+def append_temporarily(dirs: list[str], kind: Literal['append', 'prefix', 'replace'] = "append"):
+    dirs_ = []
+    for path in dirs:
+        path_rel = PathExtended(path).collapseuser(strict=False)
+        if path_rel.as_posix() in PATH or str(path_rel) in PATH or str(path_rel.expanduser()) in PATH or path_rel.expanduser().as_posix() in PATH:
+            print(f"Path passed `{path}` is already in PATH, skipping the appending.")
+        else:
+            dirs_.append(path_rel.as_posix() if system == "Linux" else str(path_rel))
+    dirs = dirs_
+    if len(dirs) == 0: return ""
+
+    if system == "Windows":
+        """Source: https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_environment_variables?view=powershell-7.2"""
+        if kind == "append": command = fr'$env:Path += ";{sep.join(dirs)}"'  # Append to the Path variable in the current window:
+        elif kind == "prefix": command = fr'$env:Path = "{sep.join(dirs)};" + $env:Path'  # Prefix the Path variable in the current window:
+        elif kind == "replace": command = fr'$env:Path = "{sep.join(dirs)}"'  # Replace the Path variable in the current window (use with caution!):
+        else: raise KeyError
+        return command  # if run is False else tm.run(command, shell="powershell")
+    elif system in ["Linux", "Darwin"]: result = f'export PATH="{sep.join(dirs)}:$PATH"'
+    else: raise ValueError
+    return result
+
 def main_env_path(choice: Optional[str] = None, profile_path: Optional[str] = None):
     env_path = LIBRARY_ROOT.joinpath("profile/env_path.toml").readit()
     dirs = env_path[f'path_{system.lower()}']['extension']
@@ -71,11 +95,14 @@ def main_env_path(choice: Optional[str] = None, profile_path: Optional[str] = No
     if choice == "none(EXIT)": return
 
     console.print(f"\n📌 Adding directories to PATH: {dirs}")
-    addition = PathVar.append_temporarily(dirs=dirs)
-    profile_path_obj = P(profile_path) if isinstance(profile_path, str) else get_shell_profile_path()
+    addition = append_temporarily(dirs=dirs)
+    profile_path_obj = PathExtended(profile_path) if isinstance(profile_path, str) else get_shell_profile_path()
     profile_path_obj.copy(name=profile_path_obj.name + ".orig_" + randstr())
     console.print(f"💾 Created backup of profile: {profile_path_obj.name}.orig_*")
-    profile_path_obj.modify_text(addition, addition, replace_line=False, notfound_append=True)
+    # Inline deprecated P.modify_text: if file missing, seed with search text before modification
+    current = profile_path_obj.read_text() if profile_path_obj.exists() else addition
+    updated = modify_text(current, addition, addition, replace_line=False, notfound_append=True)
+    profile_path_obj.write_text(updated)
     console.print(Panel("✅ PATH variables added to profile successfully", title="[bold blue]Environment[/bold blue]", border_style="blue"))
 
 
@@ -95,13 +122,13 @@ def main_add_sources_to_shell_profile(profile_path: Optional[str] = None, choice
     elif choice == "none(EXIT)": return
 
     if isinstance(profile_path, str):
-        profile_path_obj = P(profile_path)
+        profile_path_obj = PathExtended(profile_path)
     else: profile_path_obj = get_shell_profile_path()
     profile = profile_path_obj.read_text()
 
     for a_file in sources:
         tmp = a_file.replace("REPO_ROOT", REPO_ROOT.as_posix()).replace("LIBRARY_ROOT", LIBRARY_ROOT.as_posix())
-        file = P(tmp).collapseuser()  # this makes the shell profile interuseable across machines.
+        file = PathExtended(tmp).collapseuser()  # this makes the shell profile interuseable across machines.
         file = file.as_posix() if system == "Linux" else str(file)
         if file not in profile:
             if system == "Windows": 
@@ -134,11 +161,11 @@ def main_add_patches_to_shell_profile(profile_path: Optional[str] = None, choice
         patches = [choice]
         console.print(f"📌 Adding selected patch: {choice}")
 
-    profile_path_obj = P(profile_path) if isinstance(profile_path, str) else get_shell_profile_path()
+    profile_path_obj = PathExtended(profile_path) if isinstance(profile_path, str) else get_shell_profile_path()
     profile = profile_path_obj.read_text()
 
     for patch_path in patches:
-        patch_path_obj = P(patch_path)
+        patch_path_obj = PathExtended(patch_path)
         patch = patch_path_obj.read_text()
         if patch in profile: 
             console.print(f"⏭️  Patch already present: {patch_path_obj.name}")

machineconfig/scripts/linux/fire_agents

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+. $HOME/scripts/activate_ve 've'
+
+# Generate random string of length 5
+random_str=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 10 | head -n 1)
+export op_script=$HOME/tmp_results/shells/$random_str/python_return_command.sh
+# op_script=$HOME/tmp_results/shells/$random_str/python_return_command.sh
+
+if [ -f "$op_script" ]; then
+  rm $op_script
+fi
+
+
+python -m machineconfig.scripts.python.fire_agents "$@"
+
+if [ -f "$op_script" ]; then
+  echo "Running $op_script"
+  chmod +x $op_script
+  set --  # clear all positional parameters
+  source $op_script  # sourcing the script means the args passed to the this script are passed to the sourced script which cofuses the sources script as it contains activate_ve and it doesn't understand first.sh arguments.
+fi
+
+
+if [ -n "$VIRTUAL_ENV" ]; then
+  deactivate || true
+fi

machineconfig/scripts/linux/wifi_conn

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# check below if VIRTUAL_ENV is set
+# if [ -z "$VIRTUAL_ENV" ]; then
+source $HOME/scripts/activate_ve 've'
+# fi
+
+op_script=$HOME/tmp_results/shells/python_return_command.sh
+if [ -f "$op_script" ]; then
+  rm $op_script
+fi
+
+python machineconfig.scripts.python.wifi_conn
+
+if [ -f "$op_script" ]; then
+  chmod +x $op_script
+  source $op_script
+fi
+
+
+# check below if VIRTUAL_ENV enviroment variable exist, then deactivate it, otherwise skip
+if [ -n "$VIRTUAL_ENV" ]; then
+  deactivate
+fi