machineconfig 1.91__py3-none-any.whl → 1.92__py3-none-any.whl

machineconfig/__init__.py

@@ -2,9 +2,7 @@
 """DS
 """
 
-__version__ = "1.91"
+__version__ = "1.92"
 release_notes = """
-
-imporoved installer
-
+included settings
 """

machineconfig/jobs/python/check_installations.py

@@ -15,10 +15,11 @@ from crocodile.file_management import P
 from crocodile.meta import Terminal
 from tqdm import tqdm
 from typing import Optional
+from datetime import datetime
 
 
 APP_SUMMARY_PATH = LIBRARY_ROOT.joinpath(f"profile/records/{platform.system().lower()}/apps_summary_report.csv")
-CLOUD: str="gdw"  # 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.
 
 
@@ -81,6 +82,7 @@ def main() -> None:
     print(f"Checking tools collected from `{INSTALL_VERSION_ROOT}`:")
     apps_paths_raw.print()
     positive_pct: list[Optional[float]] = []
+    scan_time: list[str] = []
     detailed_results: list[dict[str, Optional[pd.DataFrame]]] = []
 
     for idx, app in enumerate(apps_paths_raw):
@@ -95,9 +97,13 @@ def main() -> None:
             ppct, df = res
             positive_pct.append(ppct)
             detailed_results.append({app.stem: df})
+        scan_time.append(datetime.now().strftime("%Y-%m-%d %H:%M"))
 
-    res_df = pd.DataFrame({"app_name": apps_paths_raw.apply(lambda x: x.stem).list, "version": app_versions, "positive_pct": positive_pct,
-                                "app_path": apps_paths_raw.apply(lambda x: x.collapseuser(strict=False).as_posix()).list})
+    res_df = pd.DataFrame({"app_name": apps_paths_raw.apply(lambda x: x.stem).list,
+                           "version": app_versions,
+                           "positive_pct": positive_pct,
+                            "scan_time": scan_time,
+                           "app_path": apps_paths_raw.apply(lambda x: x.collapseuser(strict=False).as_posix()).list})
 
     app_url: list[Optional[str]] = []
     for idx, row in tqdm(res_df.iterrows(), total=res_df.shape[0]):

machineconfig/jobs/python_custom_installers/hx.py

@@ -24,7 +24,10 @@ def main(version: Optional[str]):
     config_dict_copy["repo_url"] = "https://github.com/helix-editor/helix"
     inst = Installer.from_dict(d=config_dict_copy, name="hx")
     downloaded, _version_to_be_installed = inst.download(version=version)
-    hx_file_search = downloaded.search("hx", folders=False, files=True, r=True)
+    if platform.system() == "Windows":
+        hx_file_search = downloaded.search("hx.exe", folders=False, files=True, r=True)
+    else:
+        hx_file_search = downloaded.search("hx", folders=False, files=True, r=True)        
     assert len(hx_file_search) == 1
     hx_file = hx_file_search.list[0]
     contrib = hx_file.parent / "contrib"

machineconfig/profile/shell.py

@@ -37,9 +37,12 @@ def create_default_shell_profile():
 
 def get_shell_profile_path():
     if system == "Windows":
-        res = Terminal().run("$profile", shell="pwsh").op2path()
+        obj = Terminal().run("$PROFILE", shell="pwsh")
+        res = obj.op2path()
         if isinstance(res, P): profile_path = res
-        else: raise ValueError(f"Could not get profile path for Windows. Got {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()
     else: raise ValueError(f"Not implemented for this system {system}")
     print(f"Working on shell profile `{profile_path}`")

machineconfig/scripts/python/cloud_repo_sync.py

@@ -133,8 +133,8 @@ func(remote_repo=r'{repo_remote_root.to_str()}', local_repo=r'{repo_local_root.t
         program_2 = f"""
 rm -rfd {repo_local_root}
 mv {repo_remote_root} {repo_local_root}
-sudo chmod 600 ~/.ssh/*
-sudo chmod 700 ~/.ssh
+sudo chmod 600 $HOME/.ssh/*
+sudo chmod 700 $HOME/.ssh
 """
 
         shell_file_2 = get_shell_script(shell_script=program_2)
@@ -149,9 +149,12 @@ func(repo_local_root=r'{repo_local_root.to_str()}', repo_remote_root=r'{repo_rem
         # ================================================================================
 
         option4 = 'Remove problematic rclone file from repo and replace with remote:'
-        program_4 = """
-rm ~/dotfiles/creds/rclone/rclone.conf
-cp ~/.config/machineconfig/remote/dotfiles/creds/rclone/rclone.conf ~/dotfiles/creds/rclone
+        program_4 = f"""
+rm $HOME/dotfiles/creds/rclone/rclone.conf
+cp $HOME/.config/machineconfig/remote/dotfiles/creds/rclone/rclone.conf $HOME/dotfiles/creds/rclone
+cd $HOME/dotfiles
+git commit -am "finished merging"
+. {shell_file_1}
 """
         shell_file_4 = get_shell_script(shell_script=program_4)
         # ================================================================================
@@ -163,7 +166,7 @@ cp ~/.config/machineconfig/remote/dotfiles/creds/rclone/rclone.conf ~/dotfiles/c
 
         match action:
             case "ask":
-                choice = choose_one_option(options=[option1, option2, option3, option4])
+                choice = choose_one_option(options=[option1, option2, option3, option4], fzf=False)
                 if choice == option1: PROGRAM_PATH.write_text(shell_file_1.read_text())
                 elif choice == option2: PROGRAM_PATH.write_text(program_2)
                 elif choice == option3: PROGRAM_PATH.write_text(shell_file_3.read_text())
@@ -193,15 +196,14 @@ def delete_remote_repo_copy_and_push_local(remote_repo: str, local_repo: str, cl
 def inspect_repos(repo_local_root: str, repo_remote_root: str):
     if platform.system() == "Windows":
         program = get_wt_cmd(wd1=P(repo_local_root), wd2=P(repo_local_root))
-        write_shell_script(program=program, execute=True)
+        write_shell_script(program=program, execute=True, desc="Inspecting repos ...", preserve_cwd=True, display=True)
         return None
     elif platform.system() == "Linux":
         program = get_zellij_cmd(wd1=P(repo_local_root), wd2=P(repo_remote_root))
-        write_shell_script(program=program, execute=True)
+        write_shell_script(program=program, execute=True, desc="Inspecting repos ...", preserve_cwd=True, display=True)
         return None
     else: raise NotImplementedError(f"Platform {platform.system()} not implemented.")
 
 
-
 if __name__ == "__main__":
     args_parser()

machineconfig/scripts/python/cloud_sync.py

@@ -44,10 +44,10 @@ class Args():
     share: bool=ArgsDefaults.share
 
     root: Optional[str] = ArgsDefaults.root
-    os_specific: bool=ArgsDefaults.os_specific
-    rel2home: bool=ArgsDefaults.rel2home
+    os_specific: bool = ArgsDefaults.os_specific
+    rel2home: bool = ArgsDefaults.rel2home
 
-    encrypt: bool=ArgsDefaults.encrypt
+    encrypt: bool = ArgsDefaults.encrypt
     key: Optional[str] = ArgsDefaults.key
     pwd: Optional[str] = ArgsDefaults.pwd
 
@@ -114,6 +114,22 @@ def find_cloud_config(path: P):
 
 def parse_cloud_source_target(args: Args, source: str, target: str) -> tuple[str, str, str]:
     config = args.config
+    if config == "ss":
+        maybe_config = get_secure_share_cloud_config()
+    elif config is not None:
+        maybe_config = Args.from_config(absolute(config))
+    else:
+        maybe_config = None
+
+    if maybe_config is not None:
+        if args.zip == ArgsDefaults.zip_: args.zip = maybe_config.zip
+        if args.encrypt == ArgsDefaults.encrypt: args.encrypt = maybe_config.encrypt
+        if args.share == ArgsDefaults.share: args.share = maybe_config.share
+        if args.root == ArgsDefaults.root: args.root = maybe_config.root
+        if args.rel2home == ArgsDefaults.rel2home: args.rel2home = maybe_config.rel2home
+        if args.pwd == ArgsDefaults.pwd: args.pwd = maybe_config.pwd
+        if args.os_specific == ArgsDefaults.os_specific: args.os_specific = maybe_config.os_specific
+
     root = args.root
     rel2home = args.rel2home
     pwd = args.pwd
@@ -122,13 +138,6 @@ def parse_cloud_source_target(args: Args, source: str, target: str) -> tuple[str
     share = args.share
     os_specific = args.os_specific
 
-    if config == "ss":
-        maybe_config = get_secure_share_cloud_config()
-    elif config is not None:
-        maybe_config = Args.from_config(absolute(config))
-    else:
-        maybe_config = None
-
     if source.startswith(":"):  # default cloud name is omitted cloud_name:  # or ES in source
         # At the moment, this cloud.json defaults overrides the args and is activated only when source or target are just ":"
         # consider activating it by a flag, and also not not overriding explicitly passed args options.
@@ -184,13 +193,14 @@ def parse_cloud_source_target(args: Args, source: str, target: str) -> tuple[str
                 raise NotImplementedError("There is no .get_local_path method yet")
             else:
                 target_obj = absolute(target)
-        if zip_arg and ".zip" not in source: source += ".zip"
-        if encrypt and ".enc" not in source: source += ".enc"
+        if zip_arg and ".zip" not in source:
+            source += ".zip"
+        if encrypt and ".enc" not in source:
+            source += ".enc"
 
     elif ":" in target and (target[1] != ":" if len(target) > 1 else True):  # avoid the case of "C:/"
         target_parts: list[str] = target.split(":")
         cloud = target.split(":")[0]
-
         if len(target_parts) > 1 and target_parts[1] == ES:  # the target path is to be inferred from source.
             assert ES not in source, "You can't use $ in both source and target. Cyclical inference dependency arised."
             source_obj = absolute(source)

machineconfig/scripts/python/devops.py

@@ -110,8 +110,9 @@ def main(which: Optional[str] = None):
         program = helper()
 
     else: raise ValueError(f"Unimplemented choice: {choice_key}")
-    if program: write_shell_script(program, display=True, preserve_cwd=True, desc="Shell script prepared by Python.", execute=True if which is not None else False)
-    else: write_shell_script("echo 'Done.'", display=False, )  # Python did not return any script to run.
+    if program:
+        write_shell_script(program=program, display=True, preserve_cwd=True, desc="Shell script prepared by Python.", execute=True if which is not None else False)
+    else: write_shell_script(program="echo 'Done.'", display=False, desc="Shell script prepared by Python.", preserve_cwd=True, execute=False)  # Python did not return any script to run.
 
 
 if __name__ == "__main__":

machineconfig/scripts/python/devops_add_ssh_key.py

@@ -38,7 +38,7 @@ def get_add_ssh_key_script(path_to_key: P):
             program = LIBRARY_ROOT.joinpath("setup_windows/openssh-server_add-sshkey.ps1")
             program = P(program).expanduser().read_text().replace('$sshfile=""', f'$sshfile="{path_to_key}"')
 
-    if system() == "Linux": program += f"""
+    if system() == "Linux": program += """
 
 sudo chmod 700 ~/.ssh
 sudo chmod 644 ~/.ssh/authorized_keys

machineconfig/scripts/python/fire_jobs.py

@@ -33,6 +33,28 @@ def search_for_files_of_interest(path_obj: P):
     return files
 
 
+def convert_kwargs_to_fire_kwargs_str(kwargs: dict[str, Any]) -> str:
+    # https://google.github.io/python-fire/guide/
+    # https://github.com/google/python-fire/blob/master/docs/guide.md#argument-parsing
+    if not kwargs:  # empty dict
+        kwargs_str = ''
+    else:
+        if len(kwargs) == 1:
+            kwargs_str = f""" --{list(kwargs.keys())[0]} {list(kwargs.values())[0]} """
+        else:
+            # print(f"len(kwargs) = {len(kwargs)}")
+            tmp_list: list[str] = []
+            for k, v in kwargs.items():
+                if v is not None:
+                    item = f'"{k}": "{v}"'
+                else:
+                    item = f'"{k}": None'
+                tmp_list.append(item)
+            tmp__ = ", ".join(tmp_list)
+            kwargs_str = "'{" + tmp__  + "}'"
+    return kwargs_str
+
+
 str2obj = {"True": True, "False": False, "None": None}
 
 
@@ -56,16 +78,19 @@ def main() -> None:
     # parser.add_argument("--git_pull",        "-g", action="store_true", help="Start by pulling the git repo")
     parser.add_argument("--optimized", "-O", action="store_true", help="Run the optimized version of the function")
     parser.add_argument("--Nprocess",        "-p", type=int, help="Number of processes to use", default=1)
-    parser.add_argument("--kw", nargs="*", default=None, help="keyword arguments to pass to the function in the form of k1 v1 k2 v2 ...")
+    parser.add_argument("--kw", nargs="*", default=None, help="keyword arguments to pass to the function in the form of k1 v1 k2 v2 ... (meaning k1=v1, k2=v2, etc)")
 
     args = parser.parse_args()
+
+    # Convert args.kw to dictionary
     if args.kw is not None:
         assert len(args.kw) % 2 == 0, f"args.kw must be a list of even length. Got {len(args.kw)}"
         kwargs = dict(zip(args.kw[::2], args.kw[1::2]))
         for key, value in kwargs.items():
             if value in str2obj:
                 kwargs[key] = str2obj[value]
-        # print(f"kwargs = {kwargs}")
+        if args.function is None:  # if user passed arguments and forgot to pass function, then assume they want to run the main function.
+            args.choose_function = True
     else:
         kwargs = {}
 
@@ -120,6 +145,7 @@ def main() -> None:
         from rich import print as rprint
         rprint(Panel(message))
         exe = "streamlit run --server.address 0.0.0.0 --server.headless true"
+        exe = f"cd '{choice_file.parent}'; " + exe
     elif args.interactive is False: exe = "python"
     elif args.jupyter: exe = "jupyter-lab"
     else:
@@ -128,7 +154,7 @@ def main() -> None:
 
     if args.module or (args.debug and args.choose_function):  # because debugging tools do not support choosing functions and don't interplay with fire module. So the only way to have debugging and choose function options is to import the file as a module into a new script and run the function of interest there and debug the new script.
         import_line = get_import_module_code(str(choice_file))
-        txt: str=f"""
+        txt: str = f"""
 try:
     {import_line}
 except (ImportError, ModuleNotFoundError) as ex:
@@ -143,6 +169,7 @@ except (ImportError, ModuleNotFoundError) as ex:
             txt = txt + f"""
 res = {choice_function}({('**' + str(kwargs)) if kwargs else ''})
 """
+
         txt = f"""
 try:
     from rich.panel import Panel
@@ -155,49 +182,27 @@ except ImportError as _ex:
 """ + txt
         choice_file = P.tmp().joinpath(f'tmp_scripts/python/{P(choice_file).parent.name}_{P(choice_file).stem}_{randstr()}.py').create(parents_only=True).write_text(txt)
 
-    # determining basic command structure: putting together exe & choice_file & choice_function & pdb
+    # =========================  determining basic command structure: putting together exe & choice_file & choice_function & pdb
     if args.debug:
         if platform.system() == "Windows":
             command = f"{exe} -m ipdb {choice_file} "  # pudb is not available on windows machines, use poor man's debugger instead.
         elif platform.system() in ["Linux", "Darwin"]:
             command = f"{exe} -m pudb {choice_file} "  # TODO: functions not supported yet in debug mode.
         else: raise NotImplementedError(f"Platform {platform.system()} not supported.")
-    elif choice_function is not None and not args.module:  # if args.module, then kwargs are handled in the impot script, no need to pass them in fire command.
-        # https://google.github.io/python-fire/guide/
-        # https://github.com/google/python-fire/blob/master/docs/guide.md#argument-parsing
-        if not kwargs:  # empty dict
-            kwargs_str = ''
-        else:
-            if len(kwargs) == 1:
-                kwargs_str = f""" --{list(kwargs.keys())[0]} {list(kwargs.values())[0]} """
-            else:
-                # print(f"len(kwargs) = {len(kwargs)}")
-                tmp_list: list[str] = []
-                for k, v in kwargs.items():
-                    if v is not None:
-                        item = f'"{k}": "{v}"'
-                    else:
-                        item = f'"{k}": None'
-                    tmp_list.append(item)
-                tmp__ = ", ".join(tmp_list)
-                kwargs_str = "'{" + tmp__  + "}'"
+    elif args.module:
+        # both selected function and kwargs are mentioned in the made up script, therefore no need for fire module.
+        command = f"{exe} {choice_file} "
+    elif choice_function is not None:
+        kwargs_str = convert_kwargs_to_fire_kwargs_str(kwargs)
         command = f"{exe} -m fire {choice_file} {choice_function} {kwargs_str}"
-        # else:
-        #     print(f"{kwargs=}")
-        #     print(f"{choice_function_args=}")
-        # if choice_function != "RUN AS MAIN":
-            # kgs1, _ = interactively_run_function(module[choice_function])
-            # " ".join([f"--{k} {v}" for k, v in kgs1.items()])
+    elif args.streamlit:
+        # for .streamlit config to work, it needs to be in the current directory.
+        command = f"cd {choice_file.parent}\n\n{exe} {choice_file.name}\n\ncd {P.cwd()}"
+    elif args.cmd:
+        command = rf""" cd /d {choice_file.parent} & {exe} {choice_file.name} """
     else:
-        if not args.streamlit: command = f"{exe} {choice_file} "
-        else:
-            if not args.cmd:
-                # for .streamlit config to work, it needs to be in the current directory.
-                command = f"cd {choice_file.parent}\n\n{exe} {choice_file.name}\n\ncd {P.cwd()}"
-            else:
-                command = rf""" cd /d {choice_file.parent} & {exe} {choice_file.name} """
-            # command = f"cd {choice_file.parent}\n\n{exe} {choice_file.name}\n\ncd {P.cwd()}"
-
+        # command = f"cd {choice_file.parent}\n\n{exe} {choice_file.name}\n\ncd {P.cwd()}"
+        command = f"{exe} {choice_file} "
     # this installs in ve env, which is not execution env
     # if "ipdb" in command: install_n_import("ipdb")
     # if "pudb" in command: install_n_import("pudb")
@@ -220,7 +225,8 @@ except ImportError as _ex:
         command = f"""
 . $HOME/scripts/activate_ve {args.ve}
 python -m crocodile.cluster.templates.cli_click --file {choice_file} """
-        if choice_function is not None: command += f"--function {choice_function} "
+        if choice_function is not None:
+            command += f"--function {choice_function} "
     try: install_n_import("clipboard").copy(command)
     except Exception as ex: print(f"Failed to copy command to clipboard. {ex}")
 
@@ -365,11 +371,23 @@ def find_repo_root_path(start_path: str) -> Optional[str]:
 def get_import_module_code(module_path: str):
     root_path = find_repo_root_path(module_path)
     if root_path is None:  # just make a desperate attempt to import it
-        module_name = module_path.lstrip(os.sep).replace(os.sep, '.').replace('.py', '')
+        module_name = module_path.lstrip(os.sep).replace(os.sep, '.')
+        if module_name.endswith(".py"):
+            module_name = module_name[:-3]
     else:
         relative_path = module_path.replace(root_path, '')
-        module_name = relative_path.lstrip(os.sep).replace(os.sep, '.').replace('.py', '')
-        module_name = module_name.replace("src.", "").replace("myresources.", "").replace("resources.", "").replace("source.", "").replace("resources.", "").replace("source.", "").replace("src.", "").replace("myresources.", "").replace("resources.", "").replace("source.", "").replace("src.", "").replace("myresources.", "").replace("resources.", "").replace("source.", "").replace("src.", "").replace("myresources.", "").replace("resources.", "").replace("source.", "").replace("src.", "").replace("myresources.", "").replace("resources.", "").replace("source.", "").replace("src.", "").replace("myresources.", "").replace("resources.", "").replace("source.", "").replace("src.", "").replace("myresources.", "").replace("resources.", "").replace("source.", "").replace("src.", "").replace("resources.", "").replace("source.", "")
+        module_name = relative_path.lstrip(os.sep).replace(os.sep, '.')
+        if module_name.endswith(".py"):
+            module_name = module_name[:-3]
+        # module_name = module_name.replace("src.", "").replace("myresources.", "").replace("resources.", "").replace("source.", "")
+        if module_name.startswith("src."):
+            module_name = module_name[4:]
+        if module_name.startswith("myresources."):
+            module_name = module_name[12:]
+        if module_name.startswith("resources."):
+            module_name = module_name[10:]
+        if module_name.startswith("source."):
+            module_name = module_name[7:]
     if any(char in module_name for char in "- :/\\"):
         module_name = "IncorrectModuleName"
     # TODO: use py_compile to check if the statement is valid code to avoid syntax errors that can't be caught.

machineconfig/scripts/python/gh_models.py

@@ -6,13 +6,15 @@ from crocodile.file_management import Read, P
 
 gh_token = Read.ini(P.home().joinpath("dotfiles/creds/git/git_host_tokens.ini"))['thisismygitrepo']['newLongterm']
 endpoint = "https://models.inference.ai.azure.com"
-model_name_preferences = ["o1-preview", "o1-mini", "GPT-4o", "GPT-4-o-mini"]
+model_name_preferences = ["o3-mini", "o1-preview", "o1-mini", "GPT-4o", "GPT-4-o-mini"]
 client__ = OpenAI(
     base_url=endpoint,
     api_key=gh_token,
 )
 
-def get_response(client, model_name, messages):
+
+def get_response(client, model_name: str, messages: list[str]):
+    print(f"Getting response from model {model_name}")
     try:
         response = client.chat.completions.create(
             messages=messages,

machineconfig/scripts/python/repos.py

@@ -118,7 +118,7 @@ def main():
             if args.commit or args.all: program += git_action(a_path, action=GitAction.commit, r=args.recursive)
             if args.push or args.all: program += git_action(a_path, action=GitAction.push, r=args.recursive)
     else: program = "echo 'no action specified, try to pass --push, --pull, --commit or --all'"
-    write_shell_script(program, "Script to update repos")
+    write_shell_script(program=program, desc="Script to update repos", preserve_cwd=True)
 
 
 def record_repos(repos_root: str, r: bool=True) -> list[dict[str, Any]]:

machineconfig/scripts/python/start_slidev.py

@@ -90,7 +90,7 @@ def main() -> None:
     import socket
     try: local_ip_v4 = socket.gethostbyname(socket.gethostname() + ".local")  # without .local, in linux machines, '/etc/hosts' file content, you have an IP address mapping with '127.0.1.1' to your hostname
     except Exception:
-        print(f"Warning: Could not get local_ip_v4. This is probably because you are running a WSL instance")  # TODO find a way to get the local_ip_v4 in WSL
+        print("Warning: Could not get local_ip_v4. This is probably because you are running a WSL instance")  # TODO find a way to get the local_ip_v4 in WSL
         local_ip_v4 = socket.gethostbyname(socket.gethostname())
 
     print(f"Presentation is served at http://{platform.node()}:{port}")
@@ -103,7 +103,7 @@ def main() -> None:
     # Then you can do the following:
     program = "npm run dev slides.md -- --remote"
     PROGRAM_PATH.write_text(program)
-    print_code(program, lexer="bash")
+    print_code(code=program, lexer="bash", desc="Run the following command to start the presentation")
 
 
 if __name__ == '__main__':

machineconfig/utils/installer.py

@@ -14,7 +14,9 @@ import platform
 # import os
 
 
-LINUX_INSTALL_PATH = '/usr/local/bin'
+# LINUX_INSTALL_PATH = '/usr/local/bin'
+LINUX_INSTALL_PATH = '~/.local/bin'
+
 WINDOWS_INSTALL_PATH = P.home().joinpath("AppData/Local/Microsoft/WindowsApps").__str__()
 CATEGORY: TypeAlias = Literal["OS_SPECIFIC", "OS_GENERIC", "CUSTOM", "OS_SPECIFIC_DEV", "OS_GENERIC_DEV", "CUSTOM_DEV"]
 
@@ -60,7 +62,10 @@ def find_move_delete_linux(downloaded: P, tool_name: str, delete: Optional[bool]
     print(f"MOVING file `{repr(exe)}` to '{LINUX_INSTALL_PATH}'")
     exe.chmod(0o777)
     # exe.move(folder=LINUX_INSTALL_PATH, overwrite=False)
-    Terminal().run(f"sudo mv {exe} {LINUX_INSTALL_PATH}/").print_if_unsuccessful(desc=f"MOVING executable `{exe}` to {LINUX_INSTALL_PATH}", strict_err=True, strict_returncode=True)
+    if "/usr" in LINUX_INSTALL_PATH:
+        Terminal().run(f"sudo mv {exe} {LINUX_INSTALL_PATH}/").print_if_unsuccessful(desc=f"MOVING executable `{exe}` to {LINUX_INSTALL_PATH}", strict_err=True, strict_returncode=True)
+    else:
+        exe.move(folder=LINUX_INSTALL_PATH, overwrite=True)
     if delete: downloaded.delete(sure=True)
     exe_new_location = P(LINUX_INSTALL_PATH).joinpath(exe.name)
     return exe_new_location
@@ -110,7 +115,7 @@ class Installer:
             new_version_cli = Terminal().run(f"{self.exe_name} --version").op.replace("\n", "")
 
             if old_version_cli == new_version_cli: return f"""echo "📦️ 😑 {self.exe_name}, same version: {old_version_cli}" """
-            else: return f"""echo "📦️ 🤩 {self.exe_name} updated from {old_version_cli} === to ===> {new_version_cli}" """
+            else: return f"""echo "📦️ 🤩 {self.exe_name} updated from {old_version_cli} ➡️ TO ➡️  {new_version_cli}" """
 
         except Exception as ex:
             print(ex)
@@ -126,7 +131,7 @@ class Installer:
 
             import runpy
             print(f"Executing func `main` from `{installer_path}`to get the program to run")
-            program: str=runpy.run_path(str(installer_path), run_name=None)['main'](version=version)
+            program: str = runpy.run_path(str(installer_path), run_name=None)['main'](version=version)
             # print(program)
             Terminal(stdin=None, stdout=None, stderr=None).run_script(script=program, shell="default").print(desc="Running custom installer", capture=True)
             # import subprocess
@@ -174,6 +179,7 @@ class Installer:
             print(f"📦️ Version to be installed: {version_to_be_installed}")
             print(f"📦️ Release URL: {release_url}")
             version_to_be_installed_stripped = version_to_be_installed.replace("v", "") if self.strip_v else version_to_be_installed
+            version_to_be_installed_stripped = version_to_be_installed_stripped.replace("ipinfo-", "")
             if platform.system() == "Windows":
                 file_name = self.filename_template_windows_amd_64.format(version_to_be_installed_stripped)
             elif platform.system() == "Linux":

machineconfig/utils/utils.py

@@ -19,11 +19,10 @@ from typing import Optional, Union, TypeVar, Iterable
 
 LIBRARY_ROOT = P(machineconfig.__file__).resolve().parent  # .replace(P.home().to_str().lower(), P.home().str)
 REPO_ROOT = LIBRARY_ROOT.parent.parent
-PROGRAM_PATH = (P.tmp().joinpath("shells/python_return_command") + (".ps1" if platform.system() == "Windows" else ".sh")).create(parents_only=True)
+PROGRAM_PATH = (P.home().joinpath("tmp_results", "shells", "python_return_command") + (".ps1" if platform.system() == "Windows" else ".sh"))
 CONFIG_PATH = P.home().joinpath(".config/machineconfig")
 INSTALL_VERSION_ROOT = CONFIG_PATH.joinpath("cli_tools_installers/versions")
-INSTALL_TMP_DIR = P.tmp(folder="tmp_installers")
-
+INSTALL_TMP_DIR = P.home().joinpath("tmp_results", "tmp_installers")
 DEFAULTS_PATH = P.home().joinpath("dotfiles/machineconfig/defaults.ini")
 
 
@@ -106,7 +105,7 @@ def match_file_name(sub_string: str, search_root: Optional[P] = None) -> P:
 
         if check_tool_exists(tool_name="fzf"):
             try:
-                print("Trying with fd ...")
+                print(f"Using fd to searching for `{sub_string}` in `{search_root_obj}` ...")
                 fzf_cmd = f"cd '{search_root_obj}'; fd --type f --strip-cwd-prefix | fzf --filter={sub_string}"
                 search_res = subprocess.run(fzf_cmd, stdout=subprocess.PIPE, text=True, check=True, shell=True).stdout.split("\n")[:-1]
             except subprocess.CalledProcessError as cpe:
@@ -151,7 +150,8 @@ def choose_multiple_options(options: Iterable[T], header: str="", tail: str="",
 
 def display_options(msg: str, options: Iterable[T], header: str="", tail: str="", prompt: str="",
                     default: Optional[T] = None, fzf: bool=False, multi: bool=False, custom_input: bool=False) -> Union[T, list[T]]:
-    # TODO: replace with https://github.com/tmbo/questionary  # also see https://github.com/charmbracelet/gum
+    # TODO: replace with https://github.com/tmbo/questionary
+    # # also see https://github.com/charmbracelet/gum
     tool_name = "fzf"
     options_strings: list[str] = [str(x) for x in options]
     default_string = str(default) if default is not None else None
@@ -301,7 +301,8 @@ except ImportError: print(code)
     return shell_file
 
 
-def write_shell_script(program: str, desc: str="", preserve_cwd: bool=True, display: bool=True, execute: bool=False):
+# def write_shell_script(program: str, desc: str="", preserve_cwd: bool=True, display: bool=True, execute: bool=False):
+def write_shell_script(program: str, desc: str, preserve_cwd: bool, display: bool, execute: bool):
     if preserve_cwd:
         if platform.system() == "Windows":
             program = "$orig_path = $pwd\n" + program + "\ncd $orig_path"
@@ -316,7 +317,7 @@ def write_shell_script(program: str, desc: str="", preserve_cwd: bool=True, disp
     return None
 
 
-def print_code(code: str, lexer: str, desc: str=""):
+def print_code(code: str, lexer: str, desc: str):
     if lexer == "shell":
         if platform.system() == "Windows": lexer = "powershell"
         elif platform.system() == "Linux": lexer = "sh"

{machineconfig-1.91.dist-info → machineconfig-1.92.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: machineconfig
-Version: 1.91
+Version: 1.92
 Summary: Dotfiles management package
 Home-page: https://github.com/thisismygitrepo/machineconfig
 Author: Alex Al-Saffar

{machineconfig-1.91.dist-info → machineconfig-1.92.dist-info}/RECORD

@@ -1,7 +1,7 @@
-machineconfig/__init__.py,sha256=zFmBYpknJZWoUoOu6Zh1tiiGKu_rEvtMhSjRqhGNb1Q,79
+machineconfig/__init__.py,sha256=wu9UsflBjt4NGTucNPu5-nUn1bbUMI1U2sVVlzDviFY,75
 machineconfig/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/jobs/python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-machineconfig/jobs/python/check_installations.py,sha256=VCWm1gusV126HFS-LxW8_ALejMzvYKohTQ3zheYfLsk,7785
+machineconfig/jobs/python/check_installations.py,sha256=XchBafqLFChIOF6K5BkvV8mNeMQqmqQrX8PFP_C3zo8,8016
 machineconfig/jobs/python/checkout_version.py,sha256=CynwqWoFD8yddKw4bfJWmU9BWx2ORN0Pl6igLo50hK8,4318
 machineconfig/jobs/python/create_bootable_media.py,sha256=OGZB_hiGVVlKVXE-7mGCdNhntOiLvXsno8cyRzB0EGI,611
 machineconfig/jobs/python/create_zellij_template.py,sha256=tIGieeq2n21B_dpgkXiR_Zh2q4xUPG3QhqCwLKCkhog,1301
@@ -10,7 +10,7 @@ machineconfig/jobs/python/python_ve_symlink.py,sha256=ZdXuTfEBkO1uYc6F-xg_bWF46S
 machineconfig/jobs/python/tasks.py,sha256=palEhxnzY0roWg16-LS6mZM9pjOiUe8g9Ye7UKxe8kw,151
 machineconfig/jobs/python_custom_installers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/jobs/python_custom_installers/gh.py,sha256=4XRUUuT5b29V5WAPgJMGqxLqQ9-wbBv-mAisIxUNubQ,1433
-machineconfig/jobs/python_custom_installers/hx.py,sha256=AdrLrk8kH-Fa1Is4ZJkpxiellvYxnWof8yaGKGnU2i4,1967
+machineconfig/jobs/python_custom_installers/hx.py,sha256=drxM9mMmS3yGlakeHFPVhzSKv5SZANjAr83pXm6p6fA,2116
 machineconfig/jobs/python_generic_installers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/jobs/python_linux_installers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/jobs/python_linux_installers/dev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -20,50 +20,51 @@ machineconfig/jobs/python_windows_installers/dev/__init__.py,sha256=47DEQpj8HBSa
 machineconfig/profile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/profile/create.py,sha256=k2PKsdOdJ_Jpe9gJ2xkDh60mWlA2FS1TQpmRQUXeWvQ,5162
 machineconfig/profile/create_hardlinks.py,sha256=5y3IqCGf8qE34W40IQTLXkzig5dipUre9C9DTEhHMo4,4581
-machineconfig/profile/shell.py,sha256=FsmZhNoVmzD_Fn22jwFtstVm6fTbkcdI5qY3K8o-0cg,6136
+machineconfig/profile/shell.py,sha256=X7eYnPRZ91gCxeeFMGqToceI4eQnaQPcMP1e7FHPm04,6203
 machineconfig/scripts/__init__.py,sha256=8aZPVoch_gcI0Ihcr30zQcPjRQMWiWzDnQXnOm7spzo,73
 machineconfig/scripts/python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/scripts/python/choose_wezterm_theme.py,sha256=2nQ9ruqYENQXYepFTocjeIS03P3mFdUNN8zJxCMA6r4,2697
 machineconfig/scripts/python/cloud_copy.py,sha256=2oX58QlyhQs6SKNcAEbYhvNhIBSJyie_zKM0i2D206o,5049
 machineconfig/scripts/python/cloud_manager.py,sha256=qfmO63t1LQxO6QHhz3qxePQnas4RsNOjLV1cGK8xK8I,1639
 machineconfig/scripts/python/cloud_mount.py,sha256=7ygg8tu-L-N0Q4KYcV7X2oxQgj6aEF9uIC8YWzdPioc,4882
-machineconfig/scripts/python/cloud_repo_sync.py,sha256=RiP23IR1hpLD5bKxyahfZYPA2cbkP577DYa6g7ks86E,10178
-machineconfig/scripts/python/cloud_sync.py,sha256=4vh8AwL6OL1fMZe5278oezRVNIaLFPedjVw5pvbCD5w,11103
+machineconfig/scripts/python/cloud_repo_sync.py,sha256=MLK2EvCwJ4gHS--bpBTQDsud7GboM6rolySzieNLpiM,10402
+machineconfig/scripts/python/cloud_sync.py,sha256=B57tLfnYOEBz25jXiSaiZ4uxgiNk4djtWxv-W-gpm-E,11730
 machineconfig/scripts/python/croshell.py,sha256=qWdIAQF3rsDaVVoU9Iq855zKnS9vYGsEPRL6EvWwFEk,6457
-machineconfig/scripts/python/devops.py,sha256=jYOUsdBy9zsrxibklBVE9_vVR_oo09m20ccSWoCKQlc,5384
+machineconfig/scripts/python/devops.py,sha256=v9OrZHzsZrcd4MCGa4eqOnDtaeV1ntz4-bVjkYOSR_A,5481
 machineconfig/scripts/python/devops_add_identity.py,sha256=q0DjXowg0dr5nDVrMdyViF_OQdeTN_fDXTVcVPgddfk,1549
-machineconfig/scripts/python/devops_add_ssh_key.py,sha256=RoHO_lP1DuyKrPl_wYfAJuliRP7CVKssygy3cK2eJXo,3308
+machineconfig/scripts/python/devops_add_ssh_key.py,sha256=LX9h0Sa-U_G3adKlz2rJRS8WKVZzJy1knRpUL5QXv-c,3307
 machineconfig/scripts/python/devops_backup_retrieve.py,sha256=jAdnWZPj0wWKCZdKOrbh_ocP_mq4Qe9Go9MSsne_2MM,2825
 machineconfig/scripts/python/devops_devapps_install.py,sha256=cMCkZPiqgAhp8eopw6Ig5-zE7e2Vq0EJ3jP8EahwqYM,6461
 machineconfig/scripts/python/devops_update_repos.py,sha256=tT20CEGT7419BLYJGLF_tzMig49roBC8n2H8Pv3S6TU,2756
 machineconfig/scripts/python/dotfile.py,sha256=_-YhGv1aX2BvePfMS0NKuKVc62I6e8FnJWcoJgxGT-k,1572
-machineconfig/scripts/python/fire_jobs.py,sha256=LEJAFejj7uz5E38GWKQi1ih7JWkltgZQmUwD4PuTHfc,21090
+machineconfig/scripts/python/fire_jobs.py,sha256=y5BURxWUwi-pHx_x1ZlMLkLGZffACRMvQ9vOrhU3XlI,20967
 machineconfig/scripts/python/ftpx.py,sha256=PQ7ktw6O4Y9Mv3rdRy8rBPDQQLoEafojTBr5IpLDXW8,4643
-machineconfig/scripts/python/gh_models.py,sha256=IZ9fxb4PevUAsG3zclLGBXABda67R3mmVnUPc8Bp_wU,1841
+machineconfig/scripts/python/gh_models.py,sha256=ez_1ngamoDo9tAZq6Ur5F7marNJz6w9JWmkYRkpEI48,1924
 machineconfig/scripts/python/mount_nfs.py,sha256=WR75U_WVYHibiC2DNxEncy7x273zH8EoUjhikcVERoM,2484
 machineconfig/scripts/python/mount_nw_drive.py,sha256=YggJOZayVfj2lthQOw68Sq9pgLltXdJ83o8KCRIRjcY,1002
 machineconfig/scripts/python/mount_ssh.py,sha256=zXGHnNPN-PKD364lWN9ucOilVH3eW2WDqjwX0wXBzOY,1402
 machineconfig/scripts/python/onetimeshare.py,sha256=tveeuE_PmRuk7hwJy5c53b2eL0lvxR_MACX5X_4syy8,1881
 machineconfig/scripts/python/pomodoro.py,sha256=lb-JqrFrcuIlnWNAJGlcBYRVnaT5OyDLmNWJllz5b7M,1979
-machineconfig/scripts/python/repos.py,sha256=6X6BmOMZnK8L5v4GYLv8uQdymDxE3s6xjkpFi1SYmdQ,10333
+machineconfig/scripts/python/repos.py,sha256=YjSnQ9THvojzdrkhPj8-26cbWckEo8SGbhyuD9nsw1Y,10365
 machineconfig/scripts/python/scheduler.py,sha256=z2xEQc_XkWy3viLoyVh5Eqz7SS0U0EI7MSCxa3Zsyv8,2310
 machineconfig/scripts/python/snapshot.py,sha256=XxnGc8bOb7vgx-TpJVBzgkzQf9Fcz6VyQ3LH7sOsLDI,622
-machineconfig/scripts/python/start_slidev.py,sha256=9pw7YsSkHXsjscPP3W-IjqzdEHDifWVeU3wwaZwoz6E,4693
+machineconfig/scripts/python/start_slidev.py,sha256=LKYDWHc6hElIDrG-4iuws-HXDE_IxDDWbsMCt2wX2Fo,4757
 machineconfig/scripts/python/start_terminals.py,sha256=_iKn_L9FeAxiDr_srmwJm0Slq4LxTYHV7LP5eF-m5T8,5446
 machineconfig/scripts/python/wifi_conn.py,sha256=Zst2qB5AZ0q2BsO4xl_8kiBDrQDiHn_QkSqEPVAoi_Q,2930
 machineconfig/scripts/python/wsl_windows_transfer.py,sha256=f-rHdoC2aN-CfVEJogKfhni_N1lL68P4roeFeghWlgU,2197
+machineconfig/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/setup_windows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/setup_windows/wt_and_pwsh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/setup_windows/wt_and_pwsh/set_pwsh_theme.py,sha256=7bgzIKxjeBptvR_MAabkPaGvM-RtwjkCQl5fXiO8Jks,1616
 machineconfig/setup_windows/wt_and_pwsh/set_wt_settings.py,sha256=Vot104GT-skjx294XcYjgk-rvCf6ibqtJBFcRDtgA18,6251
 machineconfig/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-machineconfig/utils/installer.py,sha256=dbAi-z1RNZ5s2_Pnw_DHr0NdNpggJ7AfToC3IDu-67s,19627
+machineconfig/utils/installer.py,sha256=lfMinC_Va4CwDsx46BViFO7K1XstCezP8SxzbIY79Kg,19888
 machineconfig/utils/procs.py,sha256=2l2nR86RqtUUrHzrj3YzyVD2TPwwaDAMgSweljU5fuY,5176
 machineconfig/utils/scheduling.py,sha256=EetPS2TKlb_3J3LPZSsGzMaPykEycNczCqukYwEP_NE,7342
-machineconfig/utils/utils.py,sha256=R4Q4IAAhGOT0FAVQ9GoY7hCHUlUWNSXkZDfDV0SHr6A,22841
+machineconfig/utils/utils.py,sha256=llwHwk25Zs4dde3mecwMxEn5obAmNQQVqoiZNGiJGmA,23006
 machineconfig/utils/ve.py,sha256=zjXsWM7_ijty8Iz9SnUG3dPydr3sFtwakghQY-8oRlI,12655
-machineconfig-1.91.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-machineconfig-1.91.dist-info/METADATA,sha256=y_rnijmr8n1wptiAb_LZLsMge3_aWN9usF15DYJmYOM,6662
-machineconfig-1.91.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-machineconfig-1.91.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
-machineconfig-1.91.dist-info/RECORD,,
+machineconfig-1.92.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+machineconfig-1.92.dist-info/METADATA,sha256=SuGcK0KfTNA5yXk5gcOunMBDVI1kwbS7zNGYKR-MKYA,6662
+machineconfig-1.92.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+machineconfig-1.92.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
+machineconfig-1.92.dist-info/RECORD,,