aboutsummaryrefslogtreecommitdiff
path: root/mill
diff options
context:
space:
mode:
authorJuan J. Martinez <jjm@usebox.net>2024-09-28 08:11:35 +0100
committerJuan J. Martinez <jjm@usebox.net>2024-09-28 08:11:35 +0100
commit155beb280823d9efad65dd20dedc8a145faebbcd (patch)
treef8071fbe71e5b4e932e9509713de1ce3484b61de /mill
parentcc0fbaec420c3e45f2bab1885c8c4d7e41c103eb (diff)
downloadspacebeans-155beb280823d9efad65dd20dedc8a145faebbcd.tar.gz
spacebeans-155beb280823d9efad65dd20dedc8a145faebbcd.zip
Updatet Mill to 0.11.12
Diffstat (limited to 'mill')
-rwxr-xr-xmill31
1 files changed, 25 insertions, 6 deletions
diff --git a/mill b/mill
index 21625f6..d03a045 100755
--- a/mill
+++ b/mill
@@ -3,14 +3,19 @@
# 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.10.12
set -e
+if [ -z "${DEFAULT_MILL_VERSION}" ] ; then
+ DEFAULT_MILL_VERSION=0.11.12
+fi
+
if [ -z "$MILL_VERSION" ] ; then
if [ -f ".mill-version" ] ; then
MILL_VERSION="$(head -n 1 .mill-version 2> /dev/null)"
- elif [ -f "mill" ] && [ "$BASH_SOURCE" != "mill" ] ; then
+ elif [ -f ".config/mill-version" ] ; then
+ MILL_VERSION="$(head -n 1 .config/mill-version 2> /dev/null)"
+ elif [ -f "mill" ] && [ "$0" != "mill" ] ; then
MILL_VERSION=$(grep -F "DEFAULT_MILL_VERSION=" "mill" | head -n 1 | cut -d= -f2)
else
MILL_VERSION=$DEFAULT_MILL_VERSION
@@ -28,13 +33,14 @@ version_remainder="$MILL_VERSION"
MILL_MAJOR_VERSION="${version_remainder%%.*}"; version_remainder="${version_remainder#*.}"
MILL_MINOR_VERSION="${version_remainder%%.*}"; version_remainder="${version_remainder#*.}"
-if [ ! -x "$MILL_EXEC_PATH" ] ; then
- mkdir -p $MILL_DOWNLOAD_PATH
+if [ ! -s "$MILL_EXEC_PATH" ] ; then
+ mkdir -p "$MILL_DOWNLOAD_PATH"
if [ "$MILL_MAJOR_VERSION" -gt 0 ] || [ "$MILL_MINOR_VERSION" -ge 5 ] ; then
ASSEMBLY="-assembly"
fi
DOWNLOAD_FILE=$MILL_EXEC_PATH-tmp-download
- MILL_DOWNLOAD_URL="https://github.com/lihaoyi/mill/releases/download/${MILL_VERSION%%-*}/$MILL_VERSION${ASSEMBLY}"
+ MILL_VERSION_TAG=$(echo $MILL_VERSION | sed -E 's/([^-]+)(-M[0-9]+)?(-.*)?/\1\2/')
+ MILL_DOWNLOAD_URL="https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/$MILL_VERSION/mill-dist-$MILL_VERSION.jar"
curl --fail -L -o "$DOWNLOAD_FILE" "$MILL_DOWNLOAD_URL"
chmod +x "$DOWNLOAD_FILE"
mv "$DOWNLOAD_FILE" "$MILL_EXEC_PATH"
@@ -42,7 +48,20 @@ if [ ! -x "$MILL_EXEC_PATH" ] ; then
unset MILL_DOWNLOAD_URL
fi
+if [ -z "$MILL_MAIN_CLI" ] ; then
+ MILL_MAIN_CLI="${0}"
+fi
+
+MILL_FIRST_ARG=""
+
+ # first arg is a long flag for "--interactive" or starts with "-i"
+if [ "$1" = "--bsp" ] || [ "${1#"-i"}" != "$1" ] || [ "$1" = "--interactive" ] || [ "$1" = "--no-server" ] || [ "$1" = "--repl" ] || [ "$1" = "--help" ] ; then
+ # Need to preserve the first position of those listed options
+ MILL_FIRST_ARG=$1
+ shift
+fi
+
unset MILL_DOWNLOAD_PATH
unset MILL_VERSION
-exec $MILL_EXEC_PATH "$@"
+exec $MILL_EXEC_PATH $MILL_FIRST_ARG -D "mill.main.cli=${MILL_MAIN_CLI}" "$@"