machineconfig 1.7__py3-none-any.whl → 1.8__py3-none-any.whl

machineconfig/__init__.py

@@ -2,7 +2,7 @@
 """DS
 """
 
-__version__ = "1.7"
+__version__ = "1.8"
 release_notes = """
-enhanced cli
+enhanced ve management
 """

machineconfig/jobs/python/check_installations.py

@@ -2,7 +2,7 @@
 """CI
 """
 
-import crocodile.toolbox as tb
+
 import time
 import pandas as pd
 import platform
@@ -10,18 +10,21 @@ from rich.console import Console
 # from rich.progress import track
 from machineconfig.utils.utils import LIBRARY_ROOT, INSTALL_VERSION_ROOT
 from machineconfig.utils.installer import get_installed_cli_apps
+from crocodile.core import List as L, install_n_import, Struct
+from crocodile.file_management import P
+from crocodile.meta import Terminal
 from tqdm import tqdm
 from typing import Optional
 
 
 APP_SUMMARY_PATH = LIBRARY_ROOT.joinpath(f"profile/records/{platform.system().lower()}/apps_summary_report.csv")
-CLOUD: str = "gdw"  # tb.Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
+CLOUD: str = "gdw"  # Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
 # my onedrive doesn't allow sharing.
 
 
-def scan(path: tb.P, pct: float = 0.0):
-    vt = tb.install_n_import(library="vt", package="vt-py")
-    client = vt.Client(tb.P.home().joinpath("dotfiles/creds/tokens/virustotal").read_text().split("\n")[0])
+def scan(path: P, pct: float = 0.0):
+    vt = install_n_import(library="vt", package="vt-py")
+    client = vt.Client(P.home().joinpath("dotfiles/creds/tokens/virustotal").read_text().split("\n")[0])
     console = Console()
     console.rule(f"Scanning {path}. {pct:.2f}% done")
     if path.is_dir():
@@ -34,7 +37,6 @@ def scan(path: tb.P, pct: float = 0.0):
         with console.status(f"waiting for scan of {path} ... "):
             try:
                 anal = client.get_object("/analyses/{}", analysis.id)
-                # print(anal.status)
                 if anal.status == "completed": break
             except Exception as ex:  # type: ignore
                 repeat_counter += 1
@@ -42,33 +44,37 @@ def scan(path: tb.P, pct: float = 0.0):
                     raise ValueError(f"Error in scanning {path}") from ex
                 print(f"Error in scanning, trying again.")
             time.sleep(30)
-    df = pd.DataFrame(anal.results).T
+    df = pd.DataFrame(anal.results.values())
     malicious = []
     for _idx, row in df.iterrows():
+        # try:
+        #     print(row.result)
+        # except Exception as ex:  # type: ignore
+        #     print(row)
         if row.result is None and row.category in ["undetected", "type-unsupported", "failure", "timeout", "confirmed-timeout"]: continue
         else:
-            tb.Struct(row.to_dict()).print(as_config=True, title=f"Found Category {row.category}")
+            Struct(row.to_dict()).print(as_config=True, title=f"Found Category {row.category}")
             malicious.append(row)
-    positive_pct = round(len(malicious) / len(df) * 100, 1)
+    positive_pct: float = round(number=len(malicious) / len(df) * 100, ndigits=1)
     print(f"positive_ratio = {positive_pct:.1f} %")
     return positive_pct, df
 
 
 def main() -> None:
-    apps_paths_tmp: tb.List[tb.P] = get_installed_cli_apps()
-    versions_files_paths: tb.L[tb.P] = INSTALL_VERSION_ROOT.search()
+    apps_paths_tmp: L[P] = get_installed_cli_apps()
+    versions_files_paths: L[P] = INSTALL_VERSION_ROOT.search()
     app_versions: list[Optional[str]] = []
-    apps_paths_raw: tb.L[tb.P] = tb.L([])
-    for an_app in versions_files_paths:
-        exe_path = apps_paths_tmp.filter(lambda x: x.stem == an_app.stem)
-        if len(exe_path) == 1:
-            app_versions.append(an_app.read_text())
-            apps_paths_raw.append(exe_path.list[0])
+    apps_paths_raw: L[P] = L([])
+    for an_app in apps_paths_tmp:
+        version_path = versions_files_paths.filter(lambda x: x.stem == an_app.stem)
+        if len(version_path) == 1:
+            app_versions.append(version_path.list[0].read_text())
+            apps_paths_raw.append(an_app)
         # if an_app.stem in versions_files_paths.stem:
         #     app_versions.append(versions_files_paths.filter(lambda x: x.stem == an_app.stem.replace(".exe", "")).list[0].read_text())
         # else:
         #     print(f"🤔 Cloud not find a documented version for installation of {an_app.stem}, trying to get it from the app itself.")
-        #     tmp = tb.Terminal().run(f"{an_app.stem} --version", shell="powershell").capture().op_if_successfull_or_default(strict_err=False, strict_returcode=False)
+        #     tmp = Terminal().run(f"{an_app.stem} --version", shell="powershell").capture().op_if_successfull_or_default(strict_err=False, strict_returcode=False)
         #     if tmp is not None: tmp = tmp.split("\n")[0]
         #     print(f"➡️ Found version `{tmp}` for {an_app.stem}.")
         #     app_versions.append(None)
@@ -94,8 +100,8 @@ def main() -> None:
 
     app_url: list[Optional[str]] = []
     for idx, row in tqdm(res_df.iterrows(), total=res_df.shape[0]):
-        apps_safe_url = upload(tb.P(str(row["app_path"])).expanduser())
-        app_url.append(apps_safe_url.as_posix() if type(apps_safe_url) is tb.P else apps_safe_url)
+        apps_safe_url = upload(P(str(row["app_path"])).expanduser())
+        app_url.append(apps_safe_url.as_posix() if type(apps_safe_url) is P else apps_safe_url)
     res_df["app_url"] = app_url
     res_df.to_csv(APP_SUMMARY_PATH.with_suffix(".csv").create(parents_only=True), index=False)
     APP_SUMMARY_PATH.with_suffix(".md").write_text(res_df.to_markdown())
@@ -103,8 +109,8 @@ def main() -> None:
     print(res_df)
 
 
-def upload(path: tb.P):
-    set_time_out = tb.install_n_import("call_function_with_timeout").SetTimeout
+def upload(path: P):
+    set_time_out = install_n_import("call_function_with_timeout").SetTimeout
     func_with_timeout = set_time_out(lambda: path.to_cloud(CLOUD, rel2home=True, share=True, os_specific=True), timeout=180)
     is_done, _is_timeout, _erro_message, results = func_with_timeout()
     if is_done: return results
@@ -113,17 +119,17 @@ def upload(path: tb.P):
 
 class PrecheckedCloudInstaller:
     def __init__(self):
-        tb.install_n_import("gdown")
+        install_n_import("gdown")
         self.df = pd.read_csv(APP_SUMMARY_PATH)
 
     @staticmethod
     def download_google_links(url: str):
         # if "drive.google.com" in str(url): url = str(url).replace("open?", "uc?")
         # else: raise NotImplementedError("Only google drive is supported for now.")
-        # return tb.P(url).download(name=name)
-        gdrive_id = tb.P(url).parts[-1].split("id=")[1]
-        gdown = tb.install_n_import("gdown")
-        result = tb.P(gdown.download(id=gdrive_id)).absolute()
+        # return P(url).download(name=name)
+        gdrive_id = P(url).parts[-1].split("id=")[1]
+        gdown = install_n_import("gdown")
+        result = P(gdown.download(id=gdrive_id)).absolute()
         return result
 
     @staticmethod
@@ -134,10 +140,10 @@ class PrecheckedCloudInstaller:
             print(f"Error in downloading {app_url} {ex}")
             return None
         if platform.system().lower() == "linux":
-            tb.Terminal().run(f"chmod +x {exe}")
-            tb.Terminal().run(f"mv {exe} /usr/local/bin/")
+            Terminal().run(f"chmod +x {exe}")
+            Terminal().run(f"mv {exe} /usr/local/bin/")
         elif platform.system().lower() == "windows":
-            exe.move(folder=tb.P.home().joinpath("AppData/Local/Microsoft/WindowsApps"), overwrite=True)
+            exe.move(folder=P.home().joinpath("AppData/Local/Microsoft/WindowsApps"), overwrite=True)
         return True
 
     def download_safe_apps(self, name: str = "AllEssentials"):
@@ -152,7 +158,7 @@ class PrecheckedCloudInstaller:
         if name == "AllEssentials":
             print(f"Downloading {self.df.shape[0]} apps ...")
             print(self.df)
-            _res = tb.L(self.df.app_url).apply(PrecheckedCloudInstaller.install_cli_apps, jobs=20)
+            _res = L(self.df.app_url).apply(PrecheckedCloudInstaller.install_cli_apps, jobs=20)
         else:
             app_url = self.df[self.df.app_name == name].iloc[0].app_url
             _res = PrecheckedCloudInstaller.install_cli_apps(app_url=app_url)

machineconfig/jobs/python/create_bootable_media.py

@@ -1,13 +1,13 @@
 
 
-# import crocodile.toolbox as tb
+# 
 
 # # one can either install rufus: https://rufus.ie/en/
 # # however, to create bootable media with multiple OSs to choose from:
 
-# tb.P(r'https://github.com/ventoy/Ventoy/archive/refs/tags/v1.0.78.zip').download().unzip().search[0]()
-# tb.P(r'https://mirrors.layeronline.com/linuxmint/stable/21/linuxmint-21-cinnamon-64bit.iso').download(folder=tb.P.home().joinpath("Downloads/os").create())
-# tb.P(r'https://download.manjaro.org/kde/21.3.7/manjaro-kde-21.3.7-minimal-220816-linux515.iso').download(folder=tb.P.home().joinpath("Downloads/os").create())
+# P(r'https://github.com/ventoy/Ventoy/archive/refs/tags/v1.0.78.zip').download().unzip().search[0]()
+# P(r'https://mirrors.layeronline.com/linuxmint/stable/21/linuxmint-21-cinnamon-64bit.iso').download(folder=P.home().joinpath("Downloads/os").create())
+# P(r'https://download.manjaro.org/kde/21.3.7/manjaro-kde-21.3.7-minimal-220816-linux515.iso').download(folder=P.home().joinpath("Downloads/os").create())
 
 
 # if __name__ == '__main__':

machineconfig/jobs/python/create_zellij_template.py

@@ -1,9 +1,10 @@
 
 """ZT
 """
-import crocodile.toolbox as tb
+
 import socket
 from machineconfig.utils.utils import choose_ssh_host, write_shell_script
+from crocodile.file_management import P
 
 prefix = """
 
@@ -41,7 +42,7 @@ def build_template(tabs: list[str]):
     for t in tabs:
         res += tab.replace("TABNAME", t).replace("TABCOMMAND", f"ssh").replace("TABARGS", t)
     res += suffix.replace("THISMACHINE", socket.gethostname())
-    file = tb.P.tmp().joinpath(f"tmp_files/templates/zellij_template.kdl").create(parents_only=True).write_text(res)
+    file = P.tmp().joinpath(f"tmp_files/templates/zellij_template.kdl").create(parents_only=True).write_text(res)
     res = f"zellij --layout {file}"
     return res
 

machineconfig/jobs/python/python_cargo_build_share.py

@@ -1,5 +1,10 @@
 
-import crocodile.toolbox as tb
+"""
+cargo install
+"""
+
+from crocodile.meta import Terminal
+from crocodile.file_management import P
 import platform
 
 
@@ -18,22 +23,22 @@ cargo install --path .
 """
     print(f"Executing {script}")
     if platform.system() == "Windows":
-        tb.Terminal(stdout=None).run(f". {tb.P.tmpfile(suffix='.ps1').write_text(script)}", shell="pwsh").print()
+        Terminal(stdout=None).run(f". {P.tmpfile(suffix='.ps1').write_text(script)}", shell="pwsh").print()
     else:
-        tb.Terminal(stdout=None).run(script, shell="pwsh")
+        Terminal(stdout=None).run(script, shell="pwsh")
 
-    exe = tb.P.home().joinpath(f".cargo/bin/{tool_name}" + (".exe" if platform.system() == "Windows" else ""))
+    exe = P.home().joinpath(f".cargo/bin/{tool_name}" + (".exe" if platform.system() == "Windows" else ""))
 
     try:
-        tb.P.home().joinpath(tool_name).delete(sure=True)
+        P.home().joinpath(tool_name).delete(sure=True)
     except PermissionError:
-        print(f"PermissionError, couldn't delete: {tb.P.home().joinpath(tool_name)}")
+        print(f"PermissionError, couldn't delete: {P.home().joinpath(tool_name)}")
 
     if platform.system() == "Windows":
-        exe = exe.move(folder=tb.P.get_env().WindowsApps)
+        exe = exe.move(folder=P.get_env().WindowsApps)
     elif platform.system() == "Linux":
-        tb.Terminal().run(f"sudo mv {exe} /usr/local/bin")
-        exe = tb.P(r"/usr/local/bin").joinpath(exe.name)
+        Terminal().run(f"sudo mv {exe} /usr/local/bin")
+        exe = P(r"/usr/local/bin").joinpath(exe.name)
     else:
         raise NotImplementedError(f"Platform {platform.system()} not supported.")
     share_link = exe.to_cloud("gdpo", share=True)

machineconfig/jobs/python/python_ve_symlink.py

@@ -2,16 +2,16 @@
 """Symlinks
 """
 
-import crocodile.toolbox as tb
+from crocodile.file_management import P
 # from machineconfig.utils.utils import display_options
 
 
 def main():
-    target = tb.P(input("Symlink to which target? ")).expanduser().absolute()
-    source = input(f"symlink from which source ? [default to: CWD/{target.name}] ") or tb.P.cwd().joinpath(target.name)
-    if isinstance(source, str): source = tb.P(source).expanduser().absolute()
-    # ve_path = display_options(msg="symlin link? ", options=tb.P.home().joinpath("ve").starget.symlink_toimport crocodile.toolbox as tb; tb.P(r'$pwd').joinpath('venv').symlink_to(r'$to'); tb.P('.gitignore').modify_text('venv', 'venv', replace_line=True)"(target.symlink_to(
-    # tb.P('.gitignore').modify_text('venv', 'venv', replace_line=True)"
+    target = P(input("Symlink to which target? ")).expanduser().absolute()
+    source = input(f"symlink from which source ? [default to: CWD/{target.name}] ") or P.cwd().joinpath(target.name)
+    if isinstance(source, str): source = P(source).expanduser().absolute()
+    # ve_path = display_options(msg="symlin link? ", options=P.home().joinpath("ve").starget.symlink_to; P(r'$pwd').joinpath('venv').symlink_to(r'$to'); P('.gitignore').modify_text('venv', 'venv', replace_line=True)"(target.symlink_to(
+    # P('.gitignore').modify_text('venv', 'venv', replace_line=True)"
     source.symlink_to(target, overwrite=True)
     return "echo '😁 Finished creating symlink.'"
 

machineconfig/jobs/{python_linux_installers/dev → script_installer}/azure_data_studio.py

@@ -1,13 +1,11 @@
 
 from typing import Optional
-
-
-__doc__ = """Azure Data Studio is a data management tool that enables working with SQL Server, Azure SQL DB and SQL DW from Windows, macOS and Linux."""
+import platform
 
 
 def main(version: Optional[str] = None):
     _ = version
-    return f"""
+    if platform.system() == "Linux": return f"""
 
 curl https://azuredatastudio-update.azurewebsites.net/latest/linux-x64/stable -o ~/azuredatastudio-linux-x64.tar.gz
 tar -xvf ~/azuredatastudio-linux-<version string>.tar.gz
@@ -15,7 +13,10 @@ echo 'export PATH="$PATH:~/azuredatastudio-linux-x64"' >> ~/.bashrc
 source ~/.bashrc
 
 """
+    elif platform.system() == "Windows": return "winget install -e --id Microsoft.AzureDataStudio"
+    else:
+        raise NotImplementedError(f"Your platform {platform.system()} is not supported!")
 
 
 if __name__ == '__main__':
-    main()
+    pass

machineconfig/jobs/{python_windows_installers/dev → script_installer}/bypass_paywall.py

@@ -1,9 +1,10 @@
 
 # import numpy as np
 # import matplotlib.pyplot as plt
-import crocodile.toolbox as tb
+
 # from platform import system
 from typing import Optional
+from crocodile.file_management import P
 
 
 __doc__ = """Plugin for chrome to bypass paywalls"""
@@ -13,10 +14,10 @@ def main(version: Optional[str] = None):
     _ = version
     # see remove paywalls and enhance YT experience by Chris Titus
     folder = r"C:\\"
-    tb.P("https://github.com/iamadamdev/bypass-paywalls-chrome/archive/master.zip").download().unzip(folder=folder, content=True)
-    tb.P(folder).joinpath("bypass-paywalls-chrome-master")
+    P("https://github.com/iamadamdev/bypass-paywalls-chrome/archive/master.zip").download().unzip(folder=folder, content=True)
+    P(folder).joinpath("bypass-paywalls-chrome-master")
     return ""
 
 
 if __name__ == '__main__':
-    main()
+    pass

machineconfig/jobs/script_installer/code.py

@@ -0,0 +1,34 @@
+
+"""vs code installer as per https://code.visualstudio.com/docs/setup/linux
+"""
+
+from typing import Optional
+import platform
+
+def main(version: Optional[str] = None):
+
+    if platform.system() == 'Linux':
+        code = """
+
+sudo apt-get install wget gpg
+wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > packages.microsoft.gpg
+sudo install -D -o root -g root -m 644 packages.microsoft.gpg /etc/apt/keyrings/packages.microsoft.gpg
+sudo sh -c 'echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" > /etc/apt/sources.list.d/vscode.list'
+rm -f packages.microsoft.gpg
+
+sudo apt install apt-transport-https -y
+sudo apt update
+sudo apt install code -y # or code-insiders
+
+"""
+
+    elif platform.system() == 'Windows':
+        code = "winget install -e --id Microsoft.VisualStudioCode"
+    else:
+        raise NotImplementedError(f"Unsupported platform: {platform.system()}")
+    _ = version
+    return code
+
+
+if __name__ == '__main__':
+    pass

machineconfig/jobs/{python_linux_installers/dev → script_installer}/docker_desktop.py

@@ -1,6 +1,6 @@
 
 # from machineconfig.utils.installer import get_latest_release
-# import crocodile.toolbox as tb
+# 
 # from crocodile.meta import Terminal
 from typing import Optional
 
@@ -38,4 +38,4 @@ sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin
 
 
 if __name__ == '__main__':
-    main()
+    pass

machineconfig/jobs/script_installer/ngrok.py

@@ -0,0 +1,29 @@
+
+"""ngrok
+"""
+
+import platform
+from typing import Optional
+
+
+def main(version: Optional[str]):
+    _ = version
+    if platform.system() == "Windows":
+        program = "winget install ngrok.ngrok"
+    elif platform.system() == "Linux":
+        # as per https://ngrok.com/docs/getting-started/?os=linux
+        program = """
+
+curl -s https://ngrok-agent.s3.amazonaws.com/ngrok.asc | \
+sudo tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null && \
+echo "deb https://ngrok-agent.s3.amazonaws.com buster main" | \
+sudo tee /etc/apt/sources.list.d/ngrok.list && \
+sudo apt update && sudo apt install ngrok
+"""
+    else:
+        raise NotImplementedError("unsupported platform")
+    return program
+
+
+if __name__ == "__main__":
+    pass

machineconfig/jobs/script_installer/skim.py

@@ -0,0 +1,21 @@
+
+"""
+Rust version of FZF (GO)
+"""
+
+# from machineconfig.utils.utils import get_latest_release
+# 
+from typing import Optional
+
+__doc__ = """skim is a fuzzy finder in rust!"""
+repo_url = r"https://github.com/lotabout/skim"
+
+
+def main(version: Optional[str] = None):
+    _ = version
+    # release = get_latest_release(repo_url.as_url_str(), suffix='x86_64-unknown-linux-musl', compression='tar.gz', linux=True, strip_v=True, download_n_extract=True)
+    pass
+
+
+if __name__ == '__main__':
+    pass

machineconfig/jobs/script_installer/wezterm.py

@@ -0,0 +1,34 @@
+
+"""wezterm installer
+"""
+
+from machineconfig.utils.installer import get_installers
+from typing import Optional
+import platform
+
+
+def main(version: Optional[str]):
+    if platform.system() == "Windows":
+        program = "winget install wez.wezterm"
+    elif platform.system() == "Linux":
+        insts = get_installers(system=platform.system(), dev=False)
+        program = ""
+        for inst in insts:
+            if "wezterm" in inst.name:
+                # as per https://wezfurlong.org/wezterm/install/linux.html#installing-on-ubuntu-and-debian-based-systems
+                downloaded, version_to_be_installed = inst.download(version=version)
+                _= version_to_be_installed
+
+                program = f"""
+sudo apt install -y {downloaded}
+rm {downloaded}
+"""
+                break
+    else:
+        raise NotImplementedError("unsupported platform")
+    return program
+
+
+if __name__ == "__main__":
+    # main(version=None)
+    pass

machineconfig/profile/create.py

@@ -5,8 +5,10 @@ This script Takes away all config files from the computer, place them in one dir
 
 """
 
-import crocodile.toolbox as tb
+
 from crocodile.environment import system, UserName  # ProgramFiles, WindowsApps  # , exe
+from crocodile.meta import Terminal
+from crocodile.file_management import P
 from machineconfig.utils.utils import symlink, LIBRARY_ROOT, REPO_ROOT, display_options
 from machineconfig.profile.shell import create_default_shell_profile
 # import os
@@ -24,7 +26,7 @@ SYSTEM = system.lower()
 # =================== SYMLINKS ====================================
 
 
-def symlink_contents(source_dir: tb.P, target_dir: tb.P, overwrite: bool = True):
+def symlink_contents(source_dir: P, target_dir: P, overwrite: bool = True):
     for a_target in target_dir.expanduser().search("*"):
         symlink(this=source_dir.joinpath(a_target.name), to_this=a_target, prioritize_to_this=overwrite)
 
@@ -58,7 +60,7 @@ def main_symlinks(choice: Optional[str] = None):
     else: choice_selected = choice
 
     if isinstance(choice_selected, str):
-        if str(choice_selected) == "all" and system == "Windows" and not tb.Terminal.is_user_admin():
+        if str(choice_selected) == "all" and system == "Windows" and not Terminal.is_user_admin():
             print("*" * 200)
             raise RuntimeError(f"Run terminal as admin and try again, otherwise, there will be too many popups for admin requests and no chance to terminate the program.")
         elif choice_selected == "all":
@@ -69,8 +71,8 @@ def main_symlinks(choice: Optional[str] = None):
 
     for program_key in program_keys:
         for file_key, file_map in symlink_mapper[program_key].items():
-            this = tb.P(file_map['this'])
-            to_this = tb.P(file_map['to_this'].replace("REPO_ROOT", REPO_ROOT.as_posix()).replace("LIBRARY_ROOT", LIBRARY_ROOT.as_posix()))
+            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()))
             if "contents" in file_map:
                 try: symlink_contents(source_dir=this, target_dir=to_this, overwrite=overwrite)
                 except Exception as ex: print("Config error: ", program_key, file_key, "missing keys 'this ==> to_this'.", ex)
@@ -87,7 +89,7 @@ def main_symlinks(choice: Optional[str] = None):
                     ERROR_LIST.append(e)
                     print("Caught error", e)
 
-    if system == "Linux": tb.Terminal().run(f'chmod +x {LIBRARY_ROOT.joinpath(f"scripts/{system.lower()}")} -R')
+    if system == "Linux": Terminal().run(f'chmod +x {LIBRARY_ROOT.joinpath(f"scripts/{system.lower()}")} -R')
 
 
 def main(choice: Optional[str] = None):

machineconfig/profile/shell.py

@@ -3,7 +3,9 @@
 """
 
 from crocodile.environment import PathVar
-import crocodile.toolbox as tb
+from crocodile.core import randstr
+from crocodile.file_management import P
+from crocodile.meta import Terminal
 from machineconfig.utils.utils import LIBRARY_ROOT, REPO_ROOT, display_options
 import platform
 from typing import Optional
@@ -27,7 +29,7 @@ def create_default_shell_profile():
     else:
         profile += "\n" + source + "\n"
         if system == "Linux":
-            res = tb.Terminal().run("cat /proc/version").op
+            res = Terminal().run("cat /proc/version").op
             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.
         profile_path.create(parents_only=True).write_text(profile)
@@ -35,10 +37,10 @@ def create_default_shell_profile():
 
 def get_shell_profile_path():
     if system == "Windows":
-        res = tb.Terminal().run("$profile", shell="pwsh").op2path()
-        if isinstance(res, tb.P): profile_path = res
+        res = Terminal().run("$profile", shell="pwsh").op2path()
+        if isinstance(res, P): profile_path = res
         else: raise ValueError(f"Could not get profile path for Windows. Got {res}")
-    elif system == "Linux": profile_path = tb.P("~/.bashrc").expanduser()
+    elif system == "Linux": profile_path = P("~/.bashrc").expanduser()
     else: raise ValueError(f"Not implemented for this system {system}")
     print(f"Working on shell profile `{profile_path}`")
     return profile_path
@@ -49,7 +51,7 @@ def main_env_path(choice: Optional[str] = None, profile_path: Optional[str] = No
     dirs = env_path[f'path_{system.lower()}']['extension']
 
     print(f"Current PATH: ", "\n============")
-    tb.P.get_env().PATH.print()
+    P.get_env().PATH.print()
 
     if choice is None:
         tmp = display_options(msg="Which directory to add?", options=dirs + ["all", "none(EXIT)"], default="none(EXIT)")
@@ -59,8 +61,8 @@ def main_env_path(choice: Optional[str] = None, profile_path: Optional[str] = No
     if choice == "none(EXIT)": return
 
     addition = PathVar.append_temporarily(dirs=dirs)
-    profile_path_obj = tb.P(profile_path) if isinstance(profile_path, str) else get_shell_profile_path()
-    profile_path_obj.copy(name=profile_path_obj.name + f".orig_" + tb.randstr())
+    profile_path_obj = P(profile_path) if isinstance(profile_path, str) else get_shell_profile_path()
+    profile_path_obj.copy(name=profile_path_obj.name + f".orig_" + randstr())
     profile_path_obj.modify_text(addition, addition, replace_line=False, notfound_append=True)
 
 
@@ -78,13 +80,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 = tb.P(profile_path)
+        profile_path_obj = P(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 = tb.P(tmp).collapseuser()  # this makes the shell profile interuseable across machines.
+        file = P(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": profile += f"\n. {file}"
@@ -104,17 +106,17 @@ def main_add_patches_to_shell_profile(profile_path: Optional[str] = None, choice
     elif str(choice) == "all": pass  # i.e. patches = patches
     else: patches = [choice]
 
-    profile_path_obj = tb.P(profile_path) if isinstance(profile_path, str) else get_shell_profile_path()
+    profile_path_obj = P(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 = tb.P(patch_path)
+        patch_path_obj = P(patch_path)
         patch = patch_path_obj.read_text()
         if patch in profile: print(f"Skipping `{patch_path_obj.name}`; patch already in profile")
         else: profile += "\n" + patch
 
     if system == "Linux":
-        res = tb.Terminal().run("cat /proc/version").op
+        res = Terminal().run("cat /proc/version").op
         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.