machineconfig 5.77__tar.gz → 5.78__tar.gz

{machineconfig-5.77/src/machineconfig.egg-info → machineconfig-5.78}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 5.77
+Version: 5.78
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -56,29 +56,19 @@ Requires-Dist: python-magic>=0.4.27; extra == "plot"
 # Welcome to machineconfig
 
 Machineconfig is a package for managing configuration files (aka dotfiles). The idea is to collect those critical, time-consuming-files-to-setup in one directory and reference them via symbolic links from their original locations. Thus, when a new machine is to be setup, all that is required is to clone the repo in that machine and create the symbolic links.
-Dotfiles include, but are not limited to:
-* `~/.gitconfig`
-* `~/.ssh`
-* `~/.aws`
-* `~/.bash_profile`
-* `~/.bashrc`
-* `~/.config`
-* `$profile` in Windows Powershell
-* etc
+Dotfiles are divided into private and public. Examples of private ones are, `~/.gitconfig`, `~/.ssh`, etc. Whereas public config files are ones like `lfrc`. The private dotfiles are placed @ `~/dotfiles`. The files therein are encrypted before backedup.
 
-
-Additionally, files that contain data, sensitive information that should not be pushed to a repository are contained in a directory `~/dotfiles`. The files therein are encrypted before backedup.
-
-
-# Windows:
+# Install On Windows:
 
 ```powershell
+
 iex (iwr bit.ly/cfgwindows).Content
 ```
 
-# Linux and MacOS
+# Install On Linux and MacOS
 
 ```bash
+
 . <(curl -sL bit.ly/cfglinux)
 ```
 

{machineconfig-5.77 → machineconfig-5.78}/README.md

@@ -11,29 +11,19 @@
 # Welcome to machineconfig
 
 Machineconfig is a package for managing configuration files (aka dotfiles). The idea is to collect those critical, time-consuming-files-to-setup in one directory and reference them via symbolic links from their original locations. Thus, when a new machine is to be setup, all that is required is to clone the repo in that machine and create the symbolic links.
-Dotfiles include, but are not limited to:
-* `~/.gitconfig`
-* `~/.ssh`
-* `~/.aws`
-* `~/.bash_profile`
-* `~/.bashrc`
-* `~/.config`
-* `$profile` in Windows Powershell
-* etc
+Dotfiles are divided into private and public. Examples of private ones are, `~/.gitconfig`, `~/.ssh`, etc. Whereas public config files are ones like `lfrc`. The private dotfiles are placed @ `~/dotfiles`. The files therein are encrypted before backedup.
 
-
-Additionally, files that contain data, sensitive information that should not be pushed to a repository are contained in a directory `~/dotfiles`. The files therein are encrypted before backedup.
-
-
-# Windows:
+# Install On Windows:
 
 ```powershell
+
 iex (iwr bit.ly/cfgwindows).Content
 ```
 
-# Linux and MacOS
+# Install On Linux and MacOS
 
 ```bash
+
 . <(curl -sL bit.ly/cfglinux)
 ```
 

{machineconfig-5.77 → machineconfig-5.78}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "5.77"
+version = "5.78"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}

{machineconfig-5.77 → machineconfig-5.78}/src/machineconfig/jobs/installer/installer_data.json

@@ -1469,14 +1469,14 @@
       "doc": "🌐 cli to get info of ips",
       "fileNamePattern": {
         "amd64": {
-          "linux": "ipinfo_{version}_linux_amd64.tar.gz",
-          "windows": "ipinfo_{version}_windows_amd64.zip",
-          "macos": "ipinfo_{version}_darwin_amd64.tar.gz"
+          "linux": "{version}_linux_amd64.tar.gz",
+          "windows": "{version}_windows_amd64.zip",
+          "macos": "{version}_darwin_amd64.tar.gz"
         },
         "arm64": {
-          "linux": "ipinfo_{version}_linux_arm64.tar.gz",
-          "windows": "ipinfo_{version}_windows_arm64.zip",
-          "macos": "ipinfo_{version}_darwin_arm64.tar.gz"
+          "linux": "{version}_linux_arm64.tar.gz",
+          "windows": "{version}_windows_arm64.zip",
+          "macos": "{version}_darwin_arm64.tar.gz"
         }
       }
     },

{machineconfig-5.77 → machineconfig-5.78}/src/machineconfig/scripts/python/devops_helpers/cli_nw.py

@@ -50,8 +50,8 @@ def get_app():
     nw_apps.command(name="s", help="Start local/global server to share files/folders via web browser", hidden=True, no_args_is_help=True)(cli_share_server.main)
     nw_apps.command(name="install-ssh-server", help="📡  [i] Install SSH server")(install_ssh_server)
     nw_apps.command(name="i", help="Install SSH server", hidden=True)(install_ssh_server)
-    nw_apps.command(name="add-ssh-key", help="🔑  [k] Add SSH public key to this machine")(add_ssh_key)
-    nw_apps.command(name="k", help="Add SSH public key to this machine", hidden=True)(add_ssh_key)
+    nw_apps.command(name="add-ssh-key", help="🔑  [k] Add SSH public key to this machine", no_args_is_help=True)(add_ssh_key)
+    nw_apps.command(name="k", help="Add SSH public key to this machine", hidden=True, no_args_is_help=True)(add_ssh_key)
     nw_apps.command(name="add-ssh-identity", help="🗝️  [a] Add SSH identity (private key) to this machine")(add_ssh_identity)
     nw_apps.command(name="a", help="Add SSH identity (private key) to this machine", hidden=True)(add_ssh_identity)
     nw_apps.command(name="show-address", help="[A] Show this computer addresses on network")(show_address)

{machineconfig-5.77 → machineconfig-5.78}/src/machineconfig/scripts/python/devops_helpers/cli_self.py

@@ -75,8 +75,8 @@ def readme():
 
 def get_app():
     cli_app = typer.Typer(help="🔄 [s] self operations subcommands", no_args_is_help=True)
-    cli_app.command("update", no_args_is_help=False, help="🔄  [u] UPDATE essential repos")(update)
-    cli_app.command("u", no_args_is_help=False, help="UPDATE essential repos", hidden=True)(update)
+    cli_app.command("update", no_args_is_help=False, help="🔄  [u] UPDATE machineconfig")(update)
+    cli_app.command("u", no_args_is_help=False, hidden=True)(update)
     cli_app.command("interactive", no_args_is_help=False, help="🤖  [i] INTERACTIVE configuration of machine.")(interactive)
     cli_app.command("i", no_args_is_help=False, help="INTERACTIVE configuration of machine.", hidden=True)(interactive)
     cli_app.command("status", no_args_is_help=False, help="📊  [s] STATUS of machine, shell profile, apps, symlinks, dotfiles, etc.")(status)

{machineconfig-5.77 → machineconfig-5.78}/src/machineconfig/scripts/python/devops_helpers/devops_add_ssh_key.py

@@ -86,6 +86,7 @@ def main(pub_path: Optional[str] = typer.Argument(None, help="Path to the public
     
     if pub_path:
         key_path = PathExtended(pub_path).expanduser().absolute()
+        key_path.parent.mkdir(parents=True, exist_ok=True)
         if not key_path.exists():
             console.print(Panel(f"❌ ERROR: Provided key path does not exist\nPath: {key_path}", title="[bold red]Error[/bold red]"))
             raise FileNotFoundError(f"Provided key path does not exist: {key_path}")
@@ -111,6 +112,7 @@ def main(pub_path: Optional[str] = typer.Argument(None, help="Path to the public
         console.print(Panel("📋 Please provide a filename and paste the public key content", title="[bold blue]Input Required[/bold blue]", border_style="blue"))
         key_filename = input("📝 File name (default: my_pasted_key.pub): ") or "my_pasted_key.pub"
         key_path = PathExtended.home().joinpath(f".ssh/{key_filename}")
+        key_path.parent.mkdir(parents=True, exist_ok=True)
         key_path.write_text(input("🔑 Paste the public key here: "), encoding="utf-8")
         console.print(Panel(f"💾 Key saved to: {key_path}", title="[bold green]Success[/bold green]", border_style="green"))
         program = get_add_ssh_key_script(key_path)
@@ -127,6 +129,7 @@ def main(pub_path: Optional[str] = typer.Argument(None, help="Path to the public
             return
         console.print(Panel(f"✅ Found {len(keys)} public key(s) for user: {from_github}", title="[bold green]Success[/bold green]", border_style="green"))
         key_path = PathExtended.home().joinpath(f".ssh/{from_github}_github_keys.pub")
+        key_path.parent.mkdir(parents=True, exist_ok=True)
         key_path.write_text("\n".join([key["key"] for key in keys]), encoding="utf-8")
         console.print(Panel(f"💾 Keys saved to: {key_path}", title="[bold green]Success[/bold green]", border_style="green"))
         program = get_add_ssh_key_script(key_path)

{machineconfig-5.77 → machineconfig-5.78}/src/machineconfig/utils/installer_utils/installer_class.py

@@ -276,9 +276,23 @@ class Installer:
             an_dl = asset.get("browser_download_url", "NA")
             available_filenames.append(an_dl.split("/")[-1])
         if filename not in available_filenames:
-            filename = filename_pattern.format(version=actual_version.replace("v", ""))
-            if filename not in available_filenames:
-                print(f"❌ Filename {filename} not found in assets: {available_filenames}")
+            candidates = [
+                filename,
+                filename_pattern.format(version=actual_version),
+                filename_pattern.format(version=actual_version.replace("v", "")),
+            ]
+
+            # Include hyphen/underscore variants
+            variants = []
+            for f in candidates:
+                variants += [f, f.replace("-", "_"), f.replace("_", "-")]
+
+            for f in variants:
+                if f in available_filenames:
+                    filename = f
+                    break
+            else:
+                print(f"❌ Filename not found in assets. Tried: {variants}\nAvailable: {available_filenames}")
                 return None, None
         browser_download_url = f"{repo_url}/releases/download/{actual_version}/{filename}"
         return browser_download_url, actual_version

{machineconfig-5.77 → machineconfig-5.78/src/machineconfig.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 5.77
+Version: 5.78
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -56,29 +56,19 @@ Requires-Dist: python-magic>=0.4.27; extra == "plot"
 # Welcome to machineconfig
 
 Machineconfig is a package for managing configuration files (aka dotfiles). The idea is to collect those critical, time-consuming-files-to-setup in one directory and reference them via symbolic links from their original locations. Thus, when a new machine is to be setup, all that is required is to clone the repo in that machine and create the symbolic links.
-Dotfiles include, but are not limited to:
-* `~/.gitconfig`
-* `~/.ssh`
-* `~/.aws`
-* `~/.bash_profile`
-* `~/.bashrc`
-* `~/.config`
-* `$profile` in Windows Powershell
-* etc
+Dotfiles are divided into private and public. Examples of private ones are, `~/.gitconfig`, `~/.ssh`, etc. Whereas public config files are ones like `lfrc`. The private dotfiles are placed @ `~/dotfiles`. The files therein are encrypted before backedup.
 
-
-Additionally, files that contain data, sensitive information that should not be pushed to a repository are contained in a directory `~/dotfiles`. The files therein are encrypted before backedup.
-
-
-# Windows:
+# Install On Windows:
 
 ```powershell
+
 iex (iwr bit.ly/cfgwindows).Content
 ```
 
-# Linux and MacOS
+# Install On Linux and MacOS
 
 ```bash
+
 . <(curl -sL bit.ly/cfglinux)
 ```