make clippy happy again (#87)

make clippy happy again

Author: D-Brox

justfile

@@ -55,5 +55,5 @@ fmt +ARGS="": spellcheck
 
 # Spellcheck the codebase
 spellcheck +ARGS="--write-changes":
-    @codespell  --builtin clear,rare,informal,code -I .codespellignore --skip target* "*.svg" data{{ARGS}}
+    @codespell  --builtin clear,rare,informal,code -I .codespellignore --skip target,data,build,po {{ARGS}}
     @echo Spellings look good!

src/package_manager.rs

@@ -339,7 +339,10 @@ impl Component for PackageManagerModel {
             commands.push("sudo groupadd -f nix-users");
             commands.push("sudo usermod -a -G nix-users $USER");
             commands.push("{ sudo systemctl enable nix-daemon.service || :; }");
-            commands.push("sudo su $USER -c 'nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixpkgs'");
+            commands.push(
+                "sudo su $USER -c 'nix-channel --add https://nixos.org/channels/nixpkgs-unstable \
+                 nixpkgs'",
+            );
             commands.push("sudo su $USER -c 'nix-channel --update'");
         }
 

src/progress.rs

@@ -1,3 +1,4 @@
+use std::fmt::Write;
 use std::io::{BufRead, BufReader};
 use std::process::{Command, Stdio};
 
@@ -146,7 +147,8 @@ impl SimpleComponent for ProgressModel {
 
                 // Aggregate all the commands.
                 for command in commands.clone() {
-                    commands_with_results += &format!(
+                    _ = write!(
+                        &mut commands_with_results,
                         "{command} && {{ echo ---successful---; }} || {{ echo ---failed---; }}; "
                     );
                 }
@@ -207,15 +209,15 @@ impl SimpleComponent for ProgressModel {
                         }
                     }
 
-                    if !error_occured {
+                    if processor.wait().is_ok() && !error_occured {
                         sender.output(Self::Output::InstallationComplete).unwrap();
                         tracing::info!("Installation complete");
                         Command::new("pkexec")
                             .args(["sh", "-c", "sudo apt remove -yq rhino-setup"])
                             .status()
                             .unwrap();
                     }
-                });
+                })
             },
         };
     }