exec format OK

Ant0wan · May 9, 2023 · 4ac9ef6 · 4ac9ef6
1 parent 1874cd5
commit 4ac9ef6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/cli.rs b/src/cli.rs
@@ -16,7 +16,7 @@ pub fn print_usage() {
 }
 
 pub fn parse_commands() -> (Vec<String>, Commands) {
-    let mut args: Vec<String> = env::args().collect();
+    let mut args: Vec<String> = env::args().skip(1).collect();
     let mut cmd = Commands {
         interactive: false,
         concurrent: false,
@@ -28,7 +28,7 @@ pub fn parse_commands() -> (Vec<String>, Commands) {
     };
     let mut allformats: Vec<String> = Vec::new();
 
-    let mut args_iter = args.iter().skip(1);
+    let mut args_iter = args.iter();
     while let Some(arg) = args_iter.next() {
         match arg.as_str() {
             "-interactive" => match env::var("TF_IN_AUTOMATION") {
@@ -75,7 +75,6 @@ pub fn parse_commands() -> (Vec<String>, Commands) {
             _ => {}
         }
     }
-
     if cmd.interactive || cmd.automation {
         args.retain(|x| x != "-interactive");
     }

diff --git a/src/exec.rs b/src/exec.rs
@@ -13,9 +13,9 @@ pub fn execute_varfiles(args: Vec<String>, cmd: Commands) {
 
 fn exec(args: Vec<String>, varfile: String, workspaceformat: String) {
     println!(
-        "TF_WORKSPACE={} {:?} -var-file={:?}",
+        "TF_WORKSPACE={} terraform {} -var-file={:?}",
         get_workspace(varfile.clone(), workspaceformat),
-        args,
+        args.join(" "),
         varfile
     );
 }