summaryrefslogtreecommitdiff
path: root/build.sc
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2019-07-08 05:38:55 +0800
committerGitHub <noreply@github.com>2019-07-08 05:38:55 +0800
commita8d1adf065f3e494bb91034960afcc7198957a2e (patch)
tree0e43bab1d48fcfd79e9281c283019d06ddb2530c /build.sc
parent79a63fb3f12e9fc856e22cdc5eba9095ad882051 (diff)
downloadmill-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-xbuild.sc2
1 files changed, 1 insertions, 1 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 ")}