Merge pull request #1207 from h2so5/set-env-before-loading-rakefile

Set ENV before loading Rakefile in minirake

1 files changed, 8 insertions, 8 deletions

diff --git a/minirake b/minirake
index d19e5d073..40e0fe6bf 100755
--- a/minirake
+++ b/minirake
@@ -435,20 +435,20 @@ class RakeApp
         end
         here = Dir.pwd
       end
+      tasks = []
+      ARGV.each do |task_name|
+        if /^(\w+)=(.*)/.match(task_name)
+          ENV[$1] = $2
+        else
+          tasks << task_name
+        end
+      end
       puts "(in #{Dir.pwd})"
       $rakefile = @rakefile
       load @rakefile
       if $show_tasks
         display_tasks
       else
-        tasks = []
-        ARGV.each do |task_name|
-          if /^(\w+)=(.*)/.match(task_name)
-            ENV[$1] = $2
-          else
-            tasks << task_name
-          end
-        end
         tasks.push("default") if tasks.size == 0
         tasks.each do |task_name|
           MiniRake::Task[task_name].invoke