Update utils.rs

Author: michal92299

hacker/src/utils.rs

@@ -4,6 +4,7 @@ use std::io::{self, Write};
 use std::thread;
 use std::time::Duration;
 use std::sync::{Arc, atomic::{AtomicBool, Ordering}};
+
 pub fn run_command_with_spinner(program: &str, args: Vec<&str>, message: &str) {
     println!("{}", format!("▶ {}: {}", message, args.join(" ")).blue().bold().on_black());
     let stop = Arc::new(AtomicBool::new(false));
@@ -45,6 +46,7 @@ pub fn run_command_with_spinner(program: &str, args: Vec<&str>, message: &str) {
         println!("{}", format!("└──────────────────────────").red().bold().on_black());
     }
 }
+
 pub fn handle_update() {
     println!("{}", "┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓".magenta().bold().on_black());
     println!("{}", "┃ Starting System Update ┃".magenta().bold().on_black());
@@ -59,23 +61,24 @@ pub fn handle_update() {
     println!("{}", "┃ System Update Complete ┃".green().bold().on_black());
     println!("{}", "┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛".green().bold().on_black());
 }
+
 pub fn handle_cybersecurity() {
     println!("{}", "========== Setting up Cybersecurity Container ==========".cyan().bold().on_black());
     run_command_with_spinner("sudo", vec!["apt", "install", "-y", "distrobox"], "Installing distrobox if not present");
     let exists = Command::new("distrobox").arg("list").output().map(|o| String::from_utf8_lossy(&o.stdout).contains("cybersecurity")).unwrap_or(false);
     if !exists {
         run_command_with_spinner("distrobox", vec!["create", "--name", "cybersecurity", "--image", "archlinux:latest"], "Creating container");
     }
-    let ba_check = Command::new("distrobox-enter").args(&["-n", "cybersecurity", "--", "sudo", "grep", "[blackarch]", "/etc/pacman.conf"]).output().map(|o| o.status.success()).unwrap_or(false);
+    let ba_check = Command::new("distrobox-enter").args(&["-n", "cybersecurity", "--", "sudo", "grep", "\\[blackarch\\]", "/etc/pacman.conf"]).output().map(|o| o.status.success()).unwrap_or(false);
     if !ba_check {
         run_command_with_spinner("distrobox-enter", vec!["-n", "cybersecurity", "--", "curl", "-O", "https://blackarch.org/strap.sh"], "Downloading strap.sh");
         run_command_with_spinner("distrobox-enter", vec!["-n", "cybersecurity", "--", "bash", "-c", "echo e26445d34490cc06bd14b51f9924debf569e0ecb strap.sh | sha1sum -c"], "Verifying sha1sum");
         run_command_with_spinner("distrobox-enter", vec!["-n", "cybersecurity", "--", "chmod", "+x", "strap.sh"], "Making executable");
         run_command_with_spinner("distrobox-enter", vec!["-n", "cybersecurity", "--", "sudo", "./strap.sh"], "Installing BlackArch");
     }
-    let multi_check = Command::new("distrobox-enter").args(&["-n", "cybersecurity", "--", "grep", "^[multilib]", "/etc/pacman.conf"]).output().map(|o| o.status.success()).unwrap_or(false);
+    let multi_check = Command::new("distrobox-enter").args(&["-n", "cybersecurity", "--", "grep", "^\\[multilib\\]", "/etc/pacman.conf"]).output().map(|o| o.status.success()).unwrap_or(false);
     if !multi_check {
-        run_command_with_spinner("distrobox-enter", vec!["-n", "cybersecurity", "--", "sudo", "sed", "-i", "/\\[multilib\\]/,/Include/s/^#//", "/etc/pacman.conf"], "Enabling multilib");
+        run_command_with_spinner("distrobox-enter", vec!["-n", "cybersecurity", "--", "sudo", "sed", "-i", "/#\\[multilib\\]/,/Include/s/^#//", "/etc/pacman.conf"], "Enabling multilib");
     }
     run_command_with_spinner("distrobox-enter", vec!["-n", "cybersecurity", "--", "sudo", "pacman", "-Syu", "--noconfirm"], "Updating system");
     let home = std::env::var("HOME").unwrap_or_default();
@@ -102,6 +105,7 @@ pub fn handle_cybersecurity() {
     }
     println!("{}", "========== Cybersecurity Setup Complete ==========".green().bold().on_black());
 }
+
 pub fn handle_gaming() {
     println!("{}", "========== Installing Gaming Tools ==========".cyan().bold().on_black());
     run_command_with_spinner("flatpak", vec!["remote-add", "--if-not-exists", "flathub", "https://dl.flathub.org/repo/flathub.flatpakrepo"], "Adding flathub repo");