From e65dcabb62f0d71010e666cc6e869089f0cfabfc Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Mon, 8 Jul 2019 04:56:13 +0800
Subject: ensure MILL_VERSION environment variable always takes precedence over
 .mill-version file, which takes precedence over DEFAULT_MILL_VERSION

---
 build.sc |  2 +-
 mill     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.sc b/build.sc
index ce02aa95..ed0a838c 100755
--- a/build.sc
+++ b/build.sc
@@ -456,7 +456,7 @@ def launcherScript(shellJvmArgs: Seq[String],
         if (millBootstrapString == "") ""
         else {
           val cutCount = millBootstrapGrepPrefix.length + 1
-          s"""if [ -f "$$PWD/mill" ] ; then
+          s"""if [ -f "mill" ] ; then
              |  if [ -z "$$MILL_EXEC_PATH" ] ; then
              |    MILL_VERSION=$$(grep -F "$millBootstrapGrepPrefix" "$$PWD/mill" | cut -c $cutCount-)
              |    ${millBootstrapStringValue.replace("\n", "\n      ")}
diff --git a/mill b/mill
index a9d2a29f..3d073df4 100755
--- a/mill
+++ b/mill
@@ -7,12 +7,12 @@ DEFAULT_MILL_VERSION=0.4.2
 
 set -e
 
-if [ -f ".mill-version" ] ; then
-  MILL_VERSION="$(head -n 1 .mill-version 2> /dev/null)"
-fi
-
 if [ -z "$MILL_VERSION" ] ; then
-  MILL_VERSION=$DEFAULT_MILL_VERSION
+  if [ -f ".mill-version" ] ; then
+    MILL_VERSION="$(head -n 1 .mill-version 2> /dev/null)"
+  else
+    MILL_VERSION=$DEFAULT_MILL_VERSION
+  fi
 fi
 
 MILL_DOWNLOAD_PATH="$HOME/.mill/download"
-- 
cgit v1.2.3