diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2019-07-08 05:38:55 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-08 05:38:55 +0800 |
commit | a8d1adf065f3e494bb91034960afcc7198957a2e (patch) | |
tree | 0e43bab1d48fcfd79e9281c283019d06ddb2530c /build.sc | |
parent | 79a63fb3f12e9fc856e22cdc5eba9095ad882051 (diff) | |
download | mill-a8d1adf065f3e494bb91034960afcc7198957a2e.tar.gz mill-a8d1adf065f3e494bb91034960afcc7198957a2e.tar.bz2 mill-a8d1adf065f3e494bb91034960afcc7198957a2e.zip |
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
Diffstat (limited to 'build.sc')
-rwxr-xr-x | build.sc | 2 |
1 files changed, 1 insertions, 1 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 ")} |