Fix self updating on unix-like systems, clippy warns

Also updated the readme. Hopefully I don't forget to update it for months like all my other abandoned projects.

Author: barely-a-dev

README.md

@@ -3,7 +3,7 @@
 `qud` is a command-line tool that **automatically detects and updates** various package managers across Linux, Windows,
 macOS, and more.
 
-> **Latest Version:** **v1.5.0**
+> **Latest Version:** **v1.5.1**
 
 ## Table of Contents
 
@@ -33,7 +33,7 @@ macOS, and more.
 
 **Linux:** `pacman`, `yay`, `apt`, `apt-get`, `dnf`, `zypper`, `snap`, `flatpak`, `xbps-install`, `apk`, `emerge`,
 `guix`, `nix`, `yum`, `eopkg`, `cave`, `sbopkg`, `scratch`
-**Windows:** `choco`, `scoop`, `winget`  
+**Windows:** `choco`, `scoop`, `winget`, `Windows`
 **General/Other:** `rustup`, `brew`, `port`, `pkg`, `cargo`, `npm`, `pip`, `composer`, `gem`, `conda`, `poetry`,
 `nuget`, `asdf`, `vcpkg`, `conan`, `stack`, `opam`, `mix`, `sdkman`, `gvm`, `pnpm`, `yarn`, `maven`, `go`
 
@@ -59,7 +59,7 @@ sudo pacman -U qud-<version>-x86_64.pkg.tar.zst
 #### Debian-based:
 
 ```bash
-sudo apt install ./qud_v1.5.0_amd64.deb
+sudo apt install ./qud_v1.5.1_amd64.deb
 ```
 
 ## Usage
@@ -78,19 +78,21 @@ It will:
 
 ## Command-Line Options
 
-| Option        | Alias | Description                                                                    |
-|---------------|-------|--------------------------------------------------------------------------------|
-| `--dry`       | `-d`  | Print update commands without executing.                                       |
-| `--excl <s>`  | `-e`  | Exclude a package (`pm::pkg`) or a package manager (`pm`). Repeatable.         |
-| `--auto`      | `-a`  | Run updates in non-interactive mode.                                           |
-| `--verbose`   | `-v`  | Enable detailed logging.                                                       |
-| `--list`      | `-l`  | List detected package managers without updating.                               |
-| `--only <pm>` | `-o`  | Update only the specified package manager(s). Repeatable.                      |
-| `--spec <s>`  | `-s`  | Override package manager executable (`pm::/path/to/executable`).               |
-| `--ext <s>`   | `-E`  | Add extra flags (`pm::"<flags>"`).                                             |
-| `--ord [s]`   | `-O`  | Set update order (e.g., `pm1,pm2,pm3`). Interactive mode if no value provided. |
-| `--help`      | `-h`  | Display help.                                                                  |
-| `--version`   | `-V`  | Show version.                                                                  |
+| Option          | Alias | Description                                                                               |
+|-----------------|-------|-------------------------------------------------------------------------------------------|
+| `--dry`         | `-d`  | Print update commands without executing.                                                  |
+| `--excl <s>`    | `-e`  | Exclude a package (`pm::pkg`) or a package manager (`pm`). Repeatable.                    |
+| `--auto`        | `-a`  | Run updates in non-interactive mode.                                                      |
+| `--verbose`     | `-v`  | Enable detailed logging.                                                                  |
+| `--list`        | `-l`  | List detected package managers without updating.                                          |
+| `--only <pm>`   | `-o`  | Update only the specified package manager(s). Repeatable.                                 |
+| `--spec <s>`    | `-s`  | Override package manager executable (`pm::/path/to/executable`).                          |
+| `--ext <s>`     | `-E`  | Add extra flags (`pm::"<flags>"`).                                                        |
+| `--ord [s]`     | `-O`  | Set update order (e.g., `pm1,pm2,pm3`). Interactive mode if no value provided.            |
+| `--help`        | `-h`  | Display help.                                                                             |
+| `--version`     | `-V`  | Show version.                                                                             |
+| `--self-update` | `-S`  | Update qud itself.                                                                        |
+ | `--noconfirm`   | `-n`  | Do not confirm before updating. Does not stop package managers from prompting, only qud.  |
 
 ## Examples
 
@@ -174,7 +176,7 @@ Submit issues or pull requests on [GitHub](https://github.com/barely-a-dev/qud).
 
 ## Version
 
-**v1.5.0**
+**v1.5.1**
 
 For assistance, visit [GitHub](https://github.com/barely-a-dev/qud). Happy updating!
 

src/conf.rs

@@ -49,21 +49,9 @@ impl Config {
             std::process::exit(0);
         }
         if pargs.contains(["-V", "--version"]) {
-            println!("qud v1.5.0");
+            println!("qud v1.5.1");
             std::process::exit(0);
         }
-        if pargs.contains(["-S", "--self-update"]) {
-            if !self_up::perm::is_elevated() {
-                eprintln!("Program must be run as root to update.");
-                std::process::exit(2);
-            }
-            println!("Updating qud...");
-            match self_up::self_update() {
-                Ok(()) => println!("qud updated successfully, exiting."),
-                Err(e) => eprintln!("qud failed to update: {e}, exiting."),
-            }
-            std::process::exit(-1);
-        }
 
         let dry_run = pargs.contains(["-d", "--dry"]);
         let excl_values: Vec<String> = pargs
@@ -75,6 +63,18 @@ impl Config {
         }
         let auto = pargs.contains(["-a", "--auto"]);
         let noconfirm = pargs.contains(["-n", "--noconfirm"]);
+        if pargs.contains(["-S", "--self-update"]) {
+            if !self_up::perm::is_elevated() {
+                eprintln!("Program must be run as root to update.");
+                std::process::exit(2);
+            }
+            println!("Updating qud...");
+            match self_up::self_update(noconfirm) {
+                Ok(()) => println!("qud updated successfully, exiting."),
+                Err(e) => eprintln!("qud failed to update: {e}, exiting."),
+            }
+            std::process::exit(-1);
+        }
         let verbose = pargs.contains(["-v", "--verbose"]);
         let list = pargs.contains(["-l", "--list"]);
         let only_values: Vec<String> = pargs
@@ -164,7 +164,7 @@ impl Config {
 
     fn print_help() {
         println!(
-            r#"qud v1.5.0
+            r#"qud v1.5.1
 
 Usage:
   qud [options]

src/main.rs

@@ -82,8 +82,8 @@ fn main() {
         .map(PathBuf::from)
     {
         if let Some(pm_name) = candidate.file_name().and_then(|s| s.to_str()) {
-            if let Some(_) = seen.get(pm_name) {
-                duplicates.entry(pm_name.to_string()).or_insert_with(Vec::new).push(candidate.clone());
+            if seen.contains_key(pm_name) {
+                duplicates.entry(pm_name.to_string()).or_default().push(candidate.clone());
             } else {
                 seen.insert(pm_name.to_string(), candidate.clone());
                 candidates.push(candidate);
@@ -638,7 +638,12 @@ fn process_pm(pm_name: &str, auto: bool, current_dir: &Path, extra_args: &[Strin
             upd("scratch", args, true, extra_args, dry_run);
         }
         "qud" => {
-            upd("qud", &["--self-update"], true, extra_args, dry_run);
+            let args: &[&str] = if auto {
+                &["--self-update", "--noconfirm"]
+            } else {
+                &["--self-update"]  
+            };
+            upd("qud", args, true, extra_args, dry_run);
         }
         _ => eprintln!(
             "{} Unknown package manager: {}",

src/self_up.rs

@@ -1,13 +1,23 @@
-use std::{
-    error::Error,
-    fs,
-    path::PathBuf,
-    process::Command,
-};
-
-pub fn self_update() -> Result<(), Box<dyn Error>> {
+use std::io::Write;
+use std::{error::Error, fs, path::PathBuf, process::Command};
+
+pub fn self_update(noconfirm: bool) -> Result<(), Box<dyn Error>> {
     let repo_url = "https://github.com/barely-a-dev/qud.git";
 
+    if !noconfirm {
+        println!("Are you sure you want to update qud v1.5.1? (Y/n)");
+        std::io::stdout().flush().unwrap();
+        let mut confirm = String::new();
+        std::io::stdin()
+            .read_line(&mut confirm)
+            .expect("Failed to read line");
+        let confirm = confirm.trim().to_lowercase();
+        if confirm == "n" || confirm == "no" {
+            println!("Update cancelled by user.");
+            std::process::exit(0);
+        }
+    }
+
     let temp_dir = std::env::temp_dir().join("qud_temp");
     if temp_dir.exists() {
         fs::remove_dir_all(&temp_dir)?;
@@ -51,6 +61,7 @@ pub fn self_update() -> Result<(), Box<dyn Error>> {
         fs::set_permissions(&binary_path, perms)?;
     }
 
+    // Define the installation path.
     #[cfg(not(target_family = "windows"))]
     let install_path = PathBuf::from("/usr/bin/qud");
 
@@ -61,13 +72,35 @@ pub fn self_update() -> Result<(), Box<dyn Error>> {
         target_dir.join("qud.exe")
     };
 
-    println!(
-        "Copying built binary from {binary_path:?} to {install_path:?}",
-    );
-    fs::copy(&binary_path, &install_path)?;
+    #[cfg(not(target_family = "windows"))]
+    {
+        let temp_install_path = install_path.with_extension("new");
+        println!(
+            "Copying built binary from {binary_path:?} to temporary location {temp_install_path:?}"
+        );
+        fs::copy(&binary_path, &temp_install_path)?;
+        
+        println!("Spawning updater process to replace the binary after exit.");
+        Command::new("sh")
+            .arg("-c")
+            .arg(format!(
+                "sleep 10 && mv {} {}",
+                temp_install_path.display(),
+                install_path.display()
+            ))
+            .spawn()?;
+
+        println!("Self-update scheduled.");
+    }
 
-    println!("Self-update successful!");
+    #[cfg(target_family = "windows")]
+    {
+        println!("Copying built binary from {binary_path:?} to {install_path:?}");
+        fs::copy(&binary_path, &install_path)?;
+        println!("Self-update successful!");
+    }
 
+    // Clean up temporary directory.
     fs::remove_dir_all(&temp_dir)?;
 
     Ok(())