From 3c2b2479b58b56ad2fbac1d33aded58b8836921e Mon Sep 17 00:00:00 2001 From: Luke Harding Date: Wed, 24 Apr 2024 14:16:27 -0400 Subject: [PATCH] Add shell command framework #6 Added the shell_commands module that will either let you run a command or automatically use `sh - c` to run a command. --- src/main.rs | 2 ++ src/shell_commands.rs | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 src/shell_commands.rs diff --git a/src/main.rs b/src/main.rs index 0aa1830..2228940 100644 --- a/src/main.rs +++ b/src/main.rs @@ -23,6 +23,8 @@ fn main() { } println!("Here we do things"); + + shell_commands::execute_in_sh("sudo pacman -Syu").unwrap(); } fn copyright_notice() -> &'static str { diff --git a/src/shell_commands.rs b/src/shell_commands.rs new file mode 100644 index 0000000..ae55771 --- /dev/null +++ b/src/shell_commands.rs @@ -0,0 +1,32 @@ +/* + Rust Arch Linux Updater + Copyright (C) 2024 Luke Harding + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + You should have received a copy of the GNU General Public License along with this program. If not, see . +*/ + +/* + shell_commands.rs + This file contains utility functions to interact with the shell. +*/ + +use std::ffi::OsStr; +use std::io; +use std::process::Command; + +pub fn execute_and_display, I>(cmd: S, args: I) -> io::Result<()> +where + I: IntoIterator, + I::Item: AsRef, +{ + let mut child = Command::new(cmd).args(args).spawn()?; + + child.wait()?; + + Ok(()) +} + +pub fn execute_in_sh(cmd: &'static str) -> io::Result<()> { + execute_and_display("sh", ["-c", cmd]) +}