Support command environment variables on Windows

RexOps · Jan 20, 2025 · 39f26af · 39f26af
1 parent 9723777
commit 39f26af
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -9,6 +9,7 @@ Revision history for Rex
 
  [ENHANCEMENTS]
  - Quote command arguments on Windows
+ - Support command environment variables on Windows
 
  [MAJOR]
 

diff --git a/lib/Rex/Interface/Exec/Local.pm b/lib/Rex/Interface/Exec/Local.pm
@@ -39,7 +39,7 @@ sub set_env {
     if ( ref $env ne "HASH" );
 
   while ( my ( $k, $v ) = each(%$env) ) {
-    $cmd .= "export $k='$v'; ";
+    $cmd .= $OSNAME eq 'MSWin32' ? "set $k=$v && " : "export $k='$v'; ";
   }
   $self->{env} = $cmd;
 }
@@ -87,6 +87,11 @@ sub exec {
 
     $cmd = $new_cmd;
   }
+  else {
+    if ( $self->{env} ) {
+      $cmd = $self->{env} . " $cmd";
+    }
+  }
 
   Rex::Logger::debug("Executing: $cmd");
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ Revision history for Rex @@
      [ENHANCEMENTS]
      - Quote command arguments on Windows
+     - Support command environment variables on Windows
      [MAJOR]
@@ Expand Down @@