From a8d1adf065f3e494bb91034960afcc7198957a2e Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Mon, 8 Jul 2019 05:38:55 +0800
Subject: Consolidate ./mill and ./millw script (#650)

* .

* ensure MILL_VERSION environment variable always takes precedence over .mill-version file, which takes precedence over DEFAULT_MILL_VERSION
---
 mill | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'mill')

diff --git a/mill b/mill
index abd5a6bf..3d073df4 100755
--- a/mill
+++ b/mill
@@ -8,7 +8,11 @@ DEFAULT_MILL_VERSION=0.4.2
 set -e
 
 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