summaryrefslogtreecommitdiff
path: root/mill
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2019-07-08 04:56:13 +0800
committerLi Haoyi <haoyi.sg@gmail.com>2019-07-08 04:56:13 +0800
commite65dcabb62f0d71010e666cc6e869089f0cfabfc (patch)
tree0e43bab1d48fcfd79e9281c283019d06ddb2530c /mill
parent05e4309be03fb2e4144ccafa03160609e2ed0278 (diff)
downloadmillw.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
Diffstat (limited to 'mill')
-rwxr-xr-xmill10
1 files changed, 5 insertions, 5 deletions
diff --git a/mill b/mill
index a9d2a29f..3d073df4 100755
--- a/mill
+++ b/mill
@@ -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"