Make [env] override module-level exports (#3312)

Author: casey

src/recipe.rs

@@ -359,14 +359,14 @@ impl<'src> Recipe<'src> {
         cmd.stdout(Stdio::null());
       }
 
+      cmd.export(settings, context.dotenv, scope, &context.module.unexports);
+
       for attribute in &self.attributes {
         if let Attribute::Env(key, value) = attribute {
           cmd.env(&key.cooked, &value.cooked);
         }
       }
 
-      cmd.export(settings, context.dotenv, scope, &context.module.unexports);
-
       let (result, caught) = cmd.status_guard();
 
       match result {
@@ -524,19 +524,19 @@ impl<'src> Recipe<'src> {
       command.args(positional);
     }
 
-    for attribute in &self.attributes {
-      if let Attribute::Env(key, value) = attribute {
-        command.env(&key.cooked, &value.cooked);
-      }
-    }
-
     command.export(
       &context.module.settings,
       context.dotenv,
       scope,
       &context.module.unexports,
     );
 
+    for attribute in &self.attributes {
+      if let Attribute::Env(key, value) = attribute {
+        command.env(&key.cooked, &value.cooked);
+      }
+    }
+
     // run it!
     let (result, caught) = command.status_guard();
 

tests/attributes.rs

@@ -428,6 +428,39 @@ fn env_attribute_too_many_arguments() {
     .failure();
 }
 
+#[test]
+fn env_attribute_overrides_export() {
+  Test::new()
+    .justfile(
+      "
+        export FOO := 'export'
+
+        [env('FOO', 'attribute')]
+        bar:
+          @echo $FOO
+      ",
+    )
+    .stdout("attribute\n")
+    .success();
+}
+
+#[test]
+fn env_attribute_overrides_export_in_script() {
+  Test::new()
+    .justfile(
+      "
+        export FOO := 'export'
+
+        [env('FOO', 'attribute')]
+        bar:
+          #!/bin/sh
+          echo $FOO
+      ",
+    )
+    .stdout("attribute\n")
+    .success();
+}
+
 #[test]
 fn env_attribute_duplicate_error() {
   Test::new()