autofix

Author: bleggett

hack/code/autofix.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+REAL_SCRIPT="$(realpath "${0}")"
+cd "$(dirname "${REAL_SCRIPT}")/../.."
+
+cargo clippy --all --fix --allow-dirty --allow-staged
+cargo fmt --all

src/checkers/script.rs

@@ -121,14 +121,14 @@ impl ScriptChecks {
         // will be self contained.
         let script_path = env::temp_dir().join("edera_preflight_pvh.sh");
         let r = fs::write(&script_path, PVH_SCRIPT);
-        if r.is_ok() {
-            if let Ok(metadata) = fs::metadata(&script_path) {
-                let mut permissions = metadata.permissions();
-
-                permissions.set_mode(0o700);
-                let _ = fs::set_permissions(&script_path, permissions);
-                script_list.push(script_path);
-            }
+        if r.is_ok()
+            && let Ok(metadata) = fs::metadata(&script_path)
+        {
+            let mut permissions = metadata.permissions();
+
+            permissions.set_mode(0o700);
+            let _ = fs::set_permissions(&script_path, permissions);
+            script_list.push(script_path);
         }
 
         let mut group_result = Passed;

src/main.rs

@@ -1,17 +1,14 @@
 mod checkers;
-mod recorders;
 mod helpers;
+mod recorders;
 
 use helpers::{
     CheckGroup, CheckGroupResult,
-    CheckResultValue::{Errored, Failed, Passed}};
-
-use checkers::{
-    kernel::KernelChecks,
-    script::ScriptChecks,
-    system::SystemChecks,
+    CheckResultValue::{Errored, Failed, Passed},
 };
 
+use checkers::{kernel::KernelChecks, script::ScriptChecks, system::SystemChecks};
+
 use recorders::system::SystemRecorder;
 
 use anyhow::{Context, Result, anyhow, bail};