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

1 files changed, 5 insertions, 1 deletions

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"