From 210c2ced036085ecbc4970726773075bf296d090 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Tue, 9 Jul 2019 06:31:07 +0800 Subject: bump mill to 0.5.0 --- mill | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/mill b/mill index 74f1d62..e969003 100755 --- a/mill +++ b/mill @@ -3,12 +3,18 @@ # This is a wrapper script, that automatically download mill from GitHub release pages # You can give the required mill version with MILL_VERSION env variable # If no version is given, it falls back to the value of DEFAULT_MILL_VERSION -DEFAULT_MILL_VERSION=0.4.2 +DEFAULT_MILL_VERSION=0.5.0 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)" + elif [ -f "mill" ] && [ "$BASH_SOURCE" != "mill" ] ; then + MILL_VERSION=$(grep -F "DEFAULT_MILL_VERSION=" "mill" | head -n 1 | cut -d= -f2) + else + MILL_VERSION=$DEFAULT_MILL_VERSION + fi fi MILL_DOWNLOAD_PATH="$HOME/.mill/download" @@ -17,10 +23,9 @@ MILL_EXEC_PATH="${MILL_DOWNLOAD_PATH}/$MILL_VERSION" if [ ! -x "$MILL_EXEC_PATH" ] ; then mkdir -p $MILL_DOWNLOAD_PATH DOWNLOAD_FILE=$MILL_EXEC_PATH-tmp-download - MILL_DOWNLOAD_URL="https://github.com/lihaoyi/mill/releases/download/${MILL_VERSION%%-*}/$MILL_VERSION" + MILL_DOWNLOAD_URL="https://github.com/lihaoyi/mill/releases/download/${MILL_VERSION%%-*}/$MILL_VERSION-assembly" curl --fail -L -o "$DOWNLOAD_FILE" "$MILL_DOWNLOAD_URL" chmod +x "$DOWNLOAD_FILE" - mkdir -p "$MILL_DOWNLOAD_PATH" mv "$DOWNLOAD_FILE" "$MILL_EXEC_PATH" unset DOWNLOAD_FILE unset MILL_DOWNLOAD_URL @@ -29,4 +34,4 @@ fi unset MILL_DOWNLOAD_PATH unset MILL_VERSION -exec $MILL_EXEC_PATH "$@" \ No newline at end of file +exec $MILL_EXEC_PATH "$@" -- cgit v1.2.3