From 5d9b7bac7ac23263f9ccee6f98c1f84b10198d39 Mon Sep 17 00:00:00 2001
From: afonso <afonso@francof.net>
Date: Mon, 26 Feb 2024 15:04:01 +0000
Subject: [PATCH] Fix bug in variables not executing if they were a command

---
 Cargo.lock      |  2 +-
 Cargo.toml      |  2 +-
 src/bin/toke.rs | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dc2b422..d48d85f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -215,7 +215,7 @@ dependencies = [
 
 [[package]]
 name = "toke-runner"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "clap",
  "regex",
diff --git a/Cargo.toml b/Cargo.toml
index 8d81bbf..f3b276a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/afonsofrancof/toke"
 readme = "README.md"
 keywords = ["cli", "toml", "command", "runner", "toke"]
 categories = ["command-line-utilities", "development-tools"]
-version = "0.1.3"
+version = "0.1.4"
 edition = "2021"
 license = "MIT"
 
diff --git a/src/bin/toke.rs b/src/bin/toke.rs
index 248d746..29f6c96 100644
--- a/src/bin/toke.rs
+++ b/src/bin/toke.rs
@@ -197,6 +197,22 @@ fn replace_variables(parsed_toml: &mut toml::Value, cli_vars: HashMap<String, St
                 merged_vars.insert(key.clone(), toml::Value::String(value.clone()));
             }
 
+            //If a variable is a command, execute it and use the output as the variable value
+            for (_key, value) in merged_vars.iter_mut() {
+                if let Some(value_str) = value.as_str() {
+                    if let Some(stripped_command) = value_str.strip_prefix('!') {
+                        let output = Command::new("sh")
+                            .arg("-c")
+                            .arg(stripped_command)
+                            .output()
+                            .expect("Failed to execute shell command");
+                        *value = toml::Value::String(
+                            String::from_utf8_lossy(&output.stdout).trim().to_string(),
+                        );
+                    }
+                }
+            }
+
             //Replace variables in the target's wildcards value
             if let Some(wildcards_value) = target_table.get_mut("wildcards") {
                 if let Some(wildcards_array) = wildcards_value.as_array_mut() {