diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2019-07-08 04:56:13 +0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2019-07-08 04:56:13 +0800 |
commit | e65dcabb62f0d71010e666cc6e869089f0cfabfc (patch) | |
tree | 0e43bab1d48fcfd79e9281c283019d06ddb2530c | |
parent | 05e4309be03fb2e4144ccafa03160609e2ed0278 (diff) | |
download | millw.tar.gz millw.tar.bz2 millw.zip |
ensure MILL_VERSION environment variable always takes precedence over .mill-version file, which takes precedence over DEFAULT_MILL_VERSIONmillw
-rwxr-xr-x | build.sc | 2 | ||||
-rwxr-xr-x | mill | 10 |
2 files changed, 6 insertions, 6 deletions
@@ -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 ")} @@ -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" |