From 9be975460b8d22de5911a6b441583022f21648f5 Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Sun, 1 Dec 2024 17:11:33 +0800
Subject: [PATCH] Integrate lefou/`millw` and `millw.bat` into Mill repository,
 fix GenIdea on windows (#4052)

Fixes https://github.com/com-lihaoyi/mill/issues/2161, fixes
https://github.com/com-lihaoyi/mill/issues/3203, parts of
https://github.com/com-lihaoyi/mill/issues/4050

For now I just merged the two files unchanged except for tweaking the
comment to refer to the `Original Project page`. We can continue to
evolve the scripts post-merge. We already had a copy in `ci/mill.bat`
that I removed, and changed the github actions to point at the top-level
version, and integrated the new `mill.bat` into the doc-site download
instructions and example zips

The changes to the `mill`/`mill.bat` scripts should be covered by the
existing integration and bootstrap tests



This is enough to make Mill's own codebase importable to IntelliJ on
Windows
---
 .github/workflows/run-mill-action.yml         |   2 +-
 build.mill                                    |   5 +-
 dist/package.mill                             |  22 +-
 .../ROOT/pages/cli/installation-ide.adoc      |   7 +-
 example/scalalib/basic/1-simple/build.mill    |   3 +-
 mill                                          | 236 ++++++++--
 ci/mill.bat => mill.bat                       | 440 +++++++++---------
 7 files changed, 453 insertions(+), 262 deletions(-)
 rename ci/mill.bat => mill.bat (95%)
 mode change 100755 => 100644

diff --git a/.github/workflows/run-mill-action.yml b/.github/workflows/run-mill-action.yml
index 4e3b6c6744f..f77fd86ad93 100644
--- a/.github/workflows/run-mill-action.yml
+++ b/.github/workflows/run-mill-action.yml
@@ -85,7 +85,7 @@ jobs:
         if: inputs.millargs != '' && !startsWith(inputs.os, 'windows')
 
       - name: Run Mill (on Windows) '${{ inputs.millargs }}'
-        run: cmd /C %GITHUB_WORKSPACE%\ci\mill.bat -i -j3 -k ${{ inputs.millargs }}
+        run: cmd /C %GITHUB_WORKSPACE%\mill.bat -i -j3 -k ${{ inputs.millargs }}
         if: inputs.millargs != '' && startsWith(inputs.os, 'windows')
 
       - name: Run Mill (on Windows) Worker Cleanup
diff --git a/build.mill b/build.mill
index 3e120c0ba48..8017b6ad4c6 100644
--- a/build.mill
+++ b/build.mill
@@ -680,7 +680,9 @@ val dummyDeps: Seq[Dep] = Seq(
 
 implicit object DepSegment extends Cross.ToSegments[Dep]({ dep =>
       val depString = formatDep(dep)
-      List(depString)
+      // these cross module names cause problems on windows, and anyway they
+      // are not necessary in order to load the project into IntelliJ anyway
+      List(depString.replace(':', '_'))
     })
 
 /**
@@ -689,6 +691,7 @@ implicit object DepSegment extends Cross.ToSegments[Dep]({ dep =>
  */
 object dummy extends Cross[DependencyFetchDummy](dummyDeps)
 trait DependencyFetchDummy extends ScalaModule with Cross.Module[Dep] {
+
   def scalaVersion = Deps.scalaVersion
   def compileIvyDeps = Agg(crossValue)
 }
diff --git a/dist/package.mill b/dist/package.mill
index 0d371823a53..50514a8078d 100644
--- a/dist/package.mill
+++ b/dist/package.mill
@@ -256,24 +256,30 @@ object `package` extends RootModule with build.MillPublishJavaModule {
     targetFile
   }
 
-  def millBootstrap = Task.Sources(Task.workspace / "mill")
+  def millBootstrap = Task.Source(Task.workspace / "mill")
+  def millBootstrapBat = Task.Source(Task.workspace / "mill.bat")
 
-  def bootstrapLauncher = Task {
-    val outputPath = Task.dest / "mill"
+  def prepareBootstrapLauncher(bootstrap: os.Path, dest: os.Path, buildVersion: String) = {
+    val outputPath = dest / "mill"
     val millBootstrapGrepPrefix = "(\n *DEFAULT_MILL_VERSION=)"
-    val millDownloadUrlPrefix = "(\n *MILL_DOWNLOAD_URL=)"
 
     os.write(
       outputPath,
-      os.read(millBootstrap().head.path)
+      os.read(bootstrap)
         .replaceAll(
           millBootstrapGrepPrefix + "[^\\n]+",
-          "$1" + build.millVersion()
+          "$1" + buildVersion
         )
     )
     os.perms.set(outputPath, "rwxrwxrwx")
     PathRef(outputPath)
   }
+  def bootstrapLauncher = Task {
+    prepareBootstrapLauncher(millBootstrap().path, Task.dest, build.millVersion())
+  }
+  def bootstrapLauncherBat = Task {
+    prepareBootstrapLauncher(millBootstrapBat().path, Task.dest, build.millVersion())
+  }
 
   def examplePathsWithArtifactName:Task[Seq[(os.Path,String)]] = Task.Anon{
     for {
@@ -292,6 +298,7 @@ object `package` extends RootModule with build.MillPublishJavaModule {
       os.copy(examplePath, Task.dest / exampleStr, createFolders = true)
       os.write(Task.dest / exampleStr / ".mill-version", build.millLastTag())
       os.copy(bootstrapLauncher().path, Task.dest / exampleStr / "mill")
+      os.copy(bootstrapLauncherBat().path, Task.dest / exampleStr / "mill.bat")
       val zip = Task.dest / s"$exampleStr.zip"
       os.proc("zip", "-r", zip, exampleStr).call(cwd = Task.dest)
       PathRef(zip)
@@ -319,7 +326,8 @@ object `package` extends RootModule with build.MillPublishJavaModule {
 
     val zips = examples ++ Seq(
       (build.dist.assembly().path, label + "-assembly"),
-      (bootstrapLauncher().path, label)
+      (bootstrapLauncher().path, label),
+      (bootstrapLauncherBat().path, label + ".bat")
     )
 
     for ((zip, name) <- zips) {
diff --git a/docs/modules/ROOT/pages/cli/installation-ide.adoc b/docs/modules/ROOT/pages/cli/installation-ide.adoc
index f2c271c0e61..a5f7df6f88f 100644
--- a/docs/modules/ROOT/pages/cli/installation-ide.adoc
+++ b/docs/modules/ROOT/pages/cli/installation-ide.adoc
@@ -14,13 +14,18 @@ globally.
 [#_bootstrap_scripts]
 == Bootstrap Scripts
 
-Although the Mill example projects come with their own `./mill` bootstrap script,
+Although the Mill example projects come with their own `./mill` and `./mill.bat` bootstrap script,
 you can also download it manually:
 
 [source,bash,subs="verbatim,attributes"]
 ----
+# Mac/Linux
 curl -L {mill-github-url}/releases/download/{mill-last-tag}/{mill-last-tag} > mill && chmod +x mill
 echo {mill-last-tag} > .mill-version
+
+# Windows
+curl -L {mill-github-url}/releases/download/{mill-last-tag}/{mill-last-tag}.bat -o mill.bat
+echo {mill-last-tag} > .mill-version
 ----
 
 Downloading a `mill` bootstrap script to the root of your project repository helps make it easier for
diff --git a/example/scalalib/basic/1-simple/build.mill b/example/scalalib/basic/1-simple/build.mill
index 057b73ff159..d6e61d0f97d 100644
--- a/example/scalalib/basic/1-simple/build.mill
+++ b/example/scalalib/basic/1-simple/build.mill
@@ -23,7 +23,8 @@ object foo extends ScalaModule {
 // You can download this example project using the *download* link above
 // if you want to try out the commands below yourself, or browse the full sources
 // of the example (including supporting files) via the *browse* link. The only requirement is
-// that you have some version of the JVM installed; the `./mill` script takes
+// that you have some version of the JVM installed; the `./mill` script
+// (`./mill.bat` on windows) takes
 // care of any further dependencies that need to be downloaded. All examples
 // in this documentation site are executable and are continually exercised as
 // part of Mill's CI workflows, and they range from the simple hello-world
diff --git a/mill b/mill
index 649c1426e54..d087ac04d54 100755
--- a/mill
+++ b/mill
@@ -1,51 +1,222 @@
 #!/usr/bin/env sh
 
 # 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
+# You can give the required mill version with --mill-version parameter
 # If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
+#
+# Original Project page: https://github.com/lefou/millw
+# Script Version: 0.4.12
+#
+# If you want to improve this script, please also contribute your changes back!
+#
+# Licensed under the Apache License, Version 2.0
 
 set -e
 
 if [ -z "${DEFAULT_MILL_VERSION}" ] ; then
-  DEFAULT_MILL_VERSION=0.12.2
+  DEFAULT_MILL_VERSION="0.11.4"
 fi
 
-if [ -z "$MILL_VERSION" ] ; then
+
+if [ -z "${GITHUB_RELEASE_CDN}" ] ; then
+  GITHUB_RELEASE_CDN=""
+fi
+
+
+MILL_REPO_URL="https://github.com/com-lihaoyi/mill"
+
+if [ -z "${CURL_CMD}" ] ; then
+  CURL_CMD=curl
+fi
+
+# Explicit commandline argument takes precedence over all other methods
+if [ "$1" = "--mill-version" ] ; then
+  shift
+  if [ "x$1" != "x" ] ; then
+    MILL_VERSION="$1"
+    shift
+  else
+    echo "You specified --mill-version without a version." 1>&2
+    echo "Please provide a version that matches one provided on" 1>&2
+    echo "${MILL_REPO_URL}/releases" 1>&2
+    false
+  fi
+fi
+
+# Please note, that if a MILL_VERSION is already set in the environment,
+# We reuse it's value and skip searching for a value.
+
+# If not already set, read .mill-version file
+if [ -z "${MILL_VERSION}" ] ; then
   if [ -f ".mill-version" ] ; then
     MILL_VERSION="$(tr '\r' '\n' < .mill-version | head -n 1 2> /dev/null)"
   elif [ -f ".config/mill-version" ] ; then
     MILL_VERSION="$(tr '\r' '\n' < .config/mill-version | head -n 1 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
   fi
 fi
 
-if [ "x${XDG_CACHE_HOME}" != "x" ] ; then
-  MILL_DOWNLOAD_PATH="${XDG_CACHE_HOME}/mill/download"
-else
-  MILL_DOWNLOAD_PATH="${HOME}/.cache/mill/download"
+MILL_USER_CACHE_DIR="${XDG_CACHE_HOME:-${HOME}/.cache}/mill"
+
+if [ -z "${MILL_DOWNLOAD_PATH}" ] ; then
+  MILL_DOWNLOAD_PATH="${MILL_USER_CACHE_DIR}/download"
+fi
+
+# If not already set, try to fetch newest from Github
+if [ -z "${MILL_VERSION}" ] ; then
+  # TODO: try to load latest version from release page
+  echo "No mill version specified." 1>&2
+  echo "You should provide a version via '.mill-version' file or --mill-version option." 1>&2
+
+  mkdir -p "${MILL_DOWNLOAD_PATH}"
+  LANG=C touch -d '1 hour ago' "${MILL_DOWNLOAD_PATH}/.expire_latest" 2>/dev/null || (
+    # we might be on OSX or BSD which don't have -d option for touch
+    # but probably a -A [-][[hh]mm]SS
+    touch "${MILL_DOWNLOAD_PATH}/.expire_latest"; touch -A -010000 "${MILL_DOWNLOAD_PATH}/.expire_latest"
+  ) || (
+    # in case we still failed, we retry the first touch command with the intention
+    # to show the (previously suppressed) error message
+    LANG=C touch -d '1 hour ago' "${MILL_DOWNLOAD_PATH}/.expire_latest"
+  )
+
+  # POSIX shell variant of bash's -nt operator, see https://unix.stackexchange.com/a/449744/6993
+  # if [ "${MILL_DOWNLOAD_PATH}/.latest" -nt "${MILL_DOWNLOAD_PATH}/.expire_latest" ] ; then
+  if [ -n "$(find -L "${MILL_DOWNLOAD_PATH}/.latest" -prune -newer "${MILL_DOWNLOAD_PATH}/.expire_latest")" ]; then
+    # we know a current latest version
+    MILL_VERSION=$(head -n 1 "${MILL_DOWNLOAD_PATH}"/.latest 2> /dev/null)
+  fi
+
+  if [ -z "${MILL_VERSION}" ] ; then
+    # we don't know a current latest version
+    echo "Retrieving latest mill version ..." 1>&2
+    LANG=C ${CURL_CMD} -s -i -f -I ${MILL_REPO_URL}/releases/latest 2> /dev/null  | grep --ignore-case Location: | sed s'/^.*tag\///' | tr -d '\r\n' > "${MILL_DOWNLOAD_PATH}/.latest"
+    MILL_VERSION=$(head -n 1 "${MILL_DOWNLOAD_PATH}"/.latest 2> /dev/null)
+  fi
+
+  if [ -z "${MILL_VERSION}" ] ; then
+    # Last resort
+    MILL_VERSION="${DEFAULT_MILL_VERSION}"
+    echo "Falling back to hardcoded mill version ${MILL_VERSION}" 1>&2
+  else
+    echo "Using mill version ${MILL_VERSION}" 1>&2
+  fi
 fi
-MILL_EXEC_PATH="${MILL_DOWNLOAD_PATH}/${MILL_VERSION}"
 
-version_remainder="$MILL_VERSION"
-MILL_MAJOR_VERSION="${version_remainder%%.*}"; version_remainder="${version_remainder#*.}"
-MILL_MINOR_VERSION="${version_remainder%%.*}"; version_remainder="${version_remainder#*.}"
+MILL="${MILL_DOWNLOAD_PATH}/${MILL_VERSION}"
 
-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"
+try_to_use_system_mill() {
+  if [ "$(uname)" != "Linux" ]; then
+    return 0
+  fi
+
+  MILL_IN_PATH="$(command -v mill || true)"
+
+  if [ -z "${MILL_IN_PATH}" ]; then
+    return 0
+  fi
+
+  SYSTEM_MILL_FIRST_TWO_BYTES=$(head --bytes=2 "${MILL_IN_PATH}")
+  if [ "${SYSTEM_MILL_FIRST_TWO_BYTES}" = "#!" ]; then
+	  # MILL_IN_PATH is (very likely) a shell script and not the mill
+	  # executable, ignore it.
+	  return 0
+  fi
+
+  SYSTEM_MILL_PATH=$(readlink -e "${MILL_IN_PATH}")
+  SYSTEM_MILL_SIZE=$(stat --format=%s "${SYSTEM_MILL_PATH}")
+  SYSTEM_MILL_MTIME=$(stat --format=%y "${SYSTEM_MILL_PATH}")
+
+  if [ ! -d "${MILL_USER_CACHE_DIR}" ]; then
+    mkdir -p "${MILL_USER_CACHE_DIR}"
+  fi
+
+  SYSTEM_MILL_INFO_FILE="${MILL_USER_CACHE_DIR}/system-mill-info"
+  if [ -f "${SYSTEM_MILL_INFO_FILE}" ]; then
+    parseSystemMillInfo() {
+        LINE_NUMBER="${1}"
+        # Select the line number of the SYSTEM_MILL_INFO_FILE, cut the
+        # variable definition in that line in two halves and return
+        # the value, and finally remove the quotes.
+        sed -n "${LINE_NUMBER}p" "${SYSTEM_MILL_INFO_FILE}" |\
+            cut -d= -f2 |\
+            sed 's/"\(.*\)"/\1/'
+    }
+
+    CACHED_SYSTEM_MILL_PATH=$(parseSystemMillInfo 1)
+    CACHED_SYSTEM_MILL_VERSION=$(parseSystemMillInfo 2)
+    CACHED_SYSTEM_MILL_SIZE=$(parseSystemMillInfo 3)
+    CACHED_SYSTEM_MILL_MTIME=$(parseSystemMillInfo 4)
+
+    if [ "${SYSTEM_MILL_PATH}" = "${CACHED_SYSTEM_MILL_PATH}" ] \
+           && [ "${SYSTEM_MILL_SIZE}" = "${CACHED_SYSTEM_MILL_SIZE}" ] \
+           && [ "${SYSTEM_MILL_MTIME}" = "${CACHED_SYSTEM_MILL_MTIME}" ]; then
+      if [ "${CACHED_SYSTEM_MILL_VERSION}" = "${MILL_VERSION}" ]; then
+          MILL="${SYSTEM_MILL_PATH}"
+          return 0
+      else
+          return 0
+      fi
+    fi
+  fi
+
+  SYSTEM_MILL_VERSION=$(${SYSTEM_MILL_PATH} --version | head -n1 | sed -n 's/^Mill.*version \(.*\)/\1/p')
+
+  cat <<EOF > "${SYSTEM_MILL_INFO_FILE}"
+CACHED_SYSTEM_MILL_PATH="${SYSTEM_MILL_PATH}"
+CACHED_SYSTEM_MILL_VERSION="${SYSTEM_MILL_VERSION}"
+CACHED_SYSTEM_MILL_SIZE="${SYSTEM_MILL_SIZE}"
+CACHED_SYSTEM_MILL_MTIME="${SYSTEM_MILL_MTIME}"
+EOF
+
+  if [ "${SYSTEM_MILL_VERSION}" = "${MILL_VERSION}" ]; then
+    MILL="${SYSTEM_MILL_PATH}"
+  fi
+}
+try_to_use_system_mill
+
+# If not already downloaded, download it
+if [ ! -s "${MILL}" ] ; then
+
+  # support old non-XDG download dir
+  MILL_OLD_DOWNLOAD_PATH="${HOME}/.mill/download"
+  OLD_MILL="${MILL_OLD_DOWNLOAD_PATH}/${MILL_VERSION}"
+  if [ -x "${OLD_MILL}" ] ; then
+    MILL="${OLD_MILL}"
+  else
+    case $MILL_VERSION in
+      0.0.* | 0.1.* | 0.2.* | 0.3.* | 0.4.* )
+        DOWNLOAD_SUFFIX=""
+        DOWNLOAD_FROM_MAVEN=0
+        ;;
+      0.5.* | 0.6.* | 0.7.* | 0.8.* | 0.9.* | 0.10.* | 0.11.0-M* )
+        DOWNLOAD_SUFFIX="-assembly"
+        DOWNLOAD_FROM_MAVEN=0
+        ;;
+      *)
+        DOWNLOAD_SUFFIX="-assembly"
+        DOWNLOAD_FROM_MAVEN=1
+        ;;
+    esac
+
+    DOWNLOAD_FILE=$(mktemp mill.XXXXXX)
+
+    if [ "$DOWNLOAD_FROM_MAVEN" = "1" ] ; then
+      DOWNLOAD_URL="https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/${MILL_VERSION}/mill-dist-${MILL_VERSION}.jar"
+    else
+      MILL_VERSION_TAG=$(echo "$MILL_VERSION" | sed -E 's/([^-]+)(-M[0-9]+)?(-.*)?/\1\2/')
+      DOWNLOAD_URL="${GITHUB_RELEASE_CDN}${MILL_REPO_URL}/releases/download/${MILL_VERSION_TAG}/${MILL_VERSION}${DOWNLOAD_SUFFIX}"
+      unset MILL_VERSION_TAG
+    fi
+
+    # TODO: handle command not found
+    echo "Downloading mill ${MILL_VERSION} from ${DOWNLOAD_URL} ..." 1>&2
+    ${CURL_CMD} -f -L -o "${DOWNLOAD_FILE}" "${DOWNLOAD_URL}"
+    chmod +x "${DOWNLOAD_FILE}"
+    mkdir -p "${MILL_DOWNLOAD_PATH}"
+    mv "${DOWNLOAD_FILE}" "${MILL}"
+
+    unset DOWNLOAD_FILE
+    unset DOWNLOAD_SUFFIX
   fi
-  DOWNLOAD_FILE=$MILL_EXEC_PATH-tmp-download
-  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"
-  unset DOWNLOAD_FILE
-  unset MILL_DOWNLOAD_URL
 fi
 
 if [ -z "$MILL_MAIN_CLI" ] ; then
@@ -53,15 +224,18 @@ if [ -z "$MILL_MAIN_CLI" ] ; then
 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
+if [ "$1" = "--bsp" ] || [ "$1" = "-i" ] || [ "$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_OLD_DOWNLOAD_PATH
+unset OLD_MILL
 unset MILL_VERSION
+unset MILL_REPO_URL
 
-exec $MILL_EXEC_PATH $MILL_FIRST_ARG -D "mill.main.cli=${MILL_MAIN_CLI}" "$@"
+# We don't quote MILL_FIRST_ARG on purpose, so we can expand the empty value without quotes
+# shellcheck disable=SC2086
+exec "${MILL}" $MILL_FIRST_ARG -D "mill.main.cli=${MILL_MAIN_CLI}" "$@"
\ No newline at end of file
diff --git a/ci/mill.bat b/mill.bat
old mode 100755
new mode 100644
similarity index 95%
rename from ci/mill.bat
rename to mill.bat
index c81a35d9374..6957369ba43
--- a/ci/mill.bat
+++ b/mill.bat
@@ -1,220 +1,220 @@
-@echo off
-
-rem This is a wrapper script, that automatically download mill from GitHub release pages
-rem You can give the required mill version with --mill-version parameter
-rem If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
-rem
-rem Project page: https://github.com/lefou/millw
-rem Script Version: 0.4.12
-rem
-rem If you want to improve this script, please also contribute your changes back!
-rem
-rem Licensed under the Apache License, Version 2.0
-
-rem setlocal seems to be unavailable on Windows 95/98/ME
-rem but I don't think we need to support them in 2019
-setlocal enabledelayedexpansion
-
-if [!DEFAULT_MILL_VERSION!]==[] (
-    set "DEFAULT_MILL_VERSION=0.11.4"
-)
-
-if [!GITHUB_RELEASE_CDN!]==[] (
-    set "GITHUB_RELEASE_CDN="
-)
-
-if [!MILL_MAIN_CLI!]==[] (
-    set "MILL_MAIN_CLI=%~f0"
-)
-
-set "MILL_REPO_URL=https://github.com/com-lihaoyi/mill"
-
-rem %~1% removes surrounding quotes
-if [%~1%]==[--mill-version] (
-  if not [%~2%]==[] (
-    set MILL_VERSION=%~2%
-    rem shift command doesn't work within parentheses
-    set "STRIP_VERSION_PARAMS=true"
-  ) else (
-    echo You specified --mill-version without a version. 1>&2
-    echo Please provide a version that matches one provided on 1>&2
-    echo %MILL_REPO_URL%/releases 1>&2
-    exit /b 1
-  )
-)
-
-if not defined STRIP_VERSION_PARAMS GOTO AfterStripVersionParams
-rem strip the: --mill-version {version}
-shift
-shift
-:AfterStripVersionParams
-
-if [!MILL_VERSION!]==[] (
-  if exist .mill-version (
-      set /p MILL_VERSION=<.mill-version
-  ) else (
-    if exist .config\mill-version (
-      set /p MILL_VERSION=<.config\mill-version
-    )
-  )
-)
-
-if [!MILL_VERSION!]==[] (
-    set MILL_VERSION=%DEFAULT_MILL_VERSION%
-)
-
-if [!MILL_DOWNLOAD_PATH!]==[] (
-    set MILL_DOWNLOAD_PATH=%USERPROFILE%\.mill\download
-)
-
-rem without bat file extension, cmd doesn't seem to be able to run it
-set MILL=%MILL_DOWNLOAD_PATH%\!MILL_VERSION!.bat
-
-if not exist "%MILL%" (
-    set VERSION_PREFIX=%MILL_VERSION:~0,4%
-    rem Since 0.5.0
-    set DOWNLOAD_SUFFIX=-assembly
-    rem Since 0.11.0
-    set DOWNLOAD_FROM_MAVEN=1
-    if [!VERSION_PREFIX!]==[0.0.] (
-        set DOWNLOAD_SUFFIX=
-        set DOWNLOAD_FROM_MAVEN=0
-    )
-    if [!VERSION_PREFIX!]==[0.1.] (
-        set DOWNLOAD_SUFFIX=
-        set DOWNLOAD_FROM_MAVEN=0
-    )
-    if [!VERSION_PREFIX!]==[0.2.] (
-        set DOWNLOAD_SUFFIX=
-        set DOWNLOAD_FROM_MAVEN=0
-    )
-    if [!VERSION_PREFIX!]==[0.3.] (
-        set DOWNLOAD_SUFFIX=
-        set DOWNLOAD_FROM_MAVEN=0
-   )
-    if [!VERSION_PREFIX!]==[0.4.] (
-        set DOWNLOAD_SUFFIX=
-        set DOWNLOAD_FROM_MAVEN=0
-    )
-    if [!VERSION_PREFIX!]==[0.5.] (
-        set DOWNLOAD_FROM_MAVEN=0
-    )
-    if [!VERSION_PREFIX!]==[0.6.] (
-        set DOWNLOAD_FROM_MAVEN=0
-    )
-    if [!VERSION_PREFIX!]==[0.7.] (
-        set DOWNLOAD_FROM_MAVEN=0
-    )
-    if [!VERSION_PREFIX!]==[0.8.] (
-        set DOWNLOAD_FROM_MAVEN=0
-    )
-    if [!VERSION_PREFIX!]==[0.9.] (
-        set DOWNLOAD_FROM_MAVEN=0
-    )
-    set VERSION_PREFIX=%MILL_VERSION:~0,5%
-    if [!VERSION_PREFIX!]==[0.10.] (
-        set DOWNLOAD_FROM_MAVEN=0
-    )
-    set VERSION_PREFIX=%MILL_VERSION:~0,8%
-    if [!VERSION_PREFIX!]==[0.11.0-M] (
-        set DOWNLOAD_FROM_MAVEN=0
-    )
-    set VERSION_PREFIX=
-
-    for /F "delims=- tokens=1" %%A in ("!MILL_VERSION!") do set MILL_VERSION_BASE=%%A
-    for /F "delims=- tokens=2" %%A in ("!MILL_VERSION!") do set MILL_VERSION_MILESTONE=%%A
-	set VERSION_MILESTONE_START=!MILL_VERSION_MILESTONE:~0,1!
-    if [!VERSION_MILESTONE_START!]==[M] (
-        set MILL_VERSION_TAG="!MILL_VERSION_BASE!-!MILL_VERSION_MILESTONE!"
-    ) else (
-        set MILL_VERSION_TAG=!MILL_VERSION_BASE!
-    )
-
-    rem there seems to be no way to generate a unique temporary file path (on native Windows)
-    set DOWNLOAD_FILE=%MILL%.tmp
-
-    if [!DOWNLOAD_FROM_MAVEN!]==[1] (
-        set DOWNLOAD_URL=https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/!MILL_VERSION!/mill-dist-!MILL_VERSION!.jar
-    ) else (
-        set DOWNLOAD_URL=!GITHUB_RELEASE_CDN!%MILL_REPO_URL%/releases/download/!MILL_VERSION_TAG!/!MILL_VERSION!!DOWNLOAD_SUFFIX!
-    )
-
-    echo Downloading mill %MILL_VERSION% from !DOWNLOAD_URL! ... 1>&2
-
-    if not exist "%MILL_DOWNLOAD_PATH%" mkdir "%MILL_DOWNLOAD_PATH%"
-    rem curl is bundled with recent Windows 10
-    rem but I don't think we can expect all the users to have it in 2019
-    where /Q curl
-    if %ERRORLEVEL% EQU 0 (
-        curl -f -L "!DOWNLOAD_URL!" -o "!DOWNLOAD_FILE!"
-    ) else (
-        rem bitsadmin seems to be available on Windows 7
-        rem without /dynamic, github returns 403
-        rem bitsadmin is sometimes needlessly slow but it looks better with /priority foreground
-        bitsadmin /transfer millDownloadJob /dynamic /priority foreground "!DOWNLOAD_URL!" "!DOWNLOAD_FILE!"
-    )
-    if not exist "!DOWNLOAD_FILE!" (
-        echo Could not download mill %MILL_VERSION% 1>&2
-        exit /b 1
-    )
-
-    move /y "!DOWNLOAD_FILE!" "%MILL%"
-
-    set DOWNLOAD_FILE=
-    set DOWNLOAD_SUFFIX=
-)
-
-set MILL_DOWNLOAD_PATH=
-set MILL_VERSION=
-set MILL_REPO_URL=
-
-rem Need to preserve the first position of those listed options
-set MILL_FIRST_ARG=
-if [%~1%]==[--bsp] (
-  set MILL_FIRST_ARG=%1%
-) else (
-  if [%~1%]==[-i] (
-    set MILL_FIRST_ARG=%1%
-  ) else (
-    if [%~1%]==[--interactive] (
-      set MILL_FIRST_ARG=%1%
-    ) else (
-      if [%~1%]==[--no-server] (
-        set MILL_FIRST_ARG=%1%
-      ) else (
-        if [%~1%]==[--repl] (
-          set MILL_FIRST_ARG=%1%
-        ) else (
-          if [%~1%]==[--help] (
-            set MILL_FIRST_ARG=%1%
-          )
-        )
-      )
-    )
-  )
-)
-
-set "MILL_PARAMS=%*%"
-
-if not [!MILL_FIRST_ARG!]==[] (
-  if defined STRIP_VERSION_PARAMS (
-    for /f "tokens=1-3*" %%a in ("%*") do (
-        set "MILL_PARAMS=%%d"
-    )
-  ) else (
-    for /f "tokens=1*" %%a in ("%*") do (
-      set "MILL_PARAMS=%%b"
-    )
-  )
-) else (
-  if defined STRIP_VERSION_PARAMS (
-    for /f "tokens=1-2*" %%a in ("%*") do (
-        rem strip %%a - It's the "--mill-version" option.
-        rem strip %%b - it's the version number that comes after the option.
-        rem keep  %%c - It's the remaining options.
-        set "MILL_PARAMS=%%c"
-    )
-  )
-)
-
-"%MILL%" %MILL_FIRST_ARG% -D "mill.main.cli=%MILL_MAIN_CLI%" %MILL_PARAMS%
+@echo off
+
+rem This is a wrapper script, that automatically download mill from GitHub release pages
+rem You can give the required mill version with --mill-version parameter
+rem If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
+rem
+rem Original Project page: https://github.com/lefou/millw
+rem Script Version: 0.4.12
+rem
+rem If you want to improve this script, please also contribute your changes back!
+rem
+rem Licensed under the Apache License, Version 2.0
+
+rem setlocal seems to be unavailable on Windows 95/98/ME
+rem but I don't think we need to support them in 2019
+setlocal enabledelayedexpansion
+
+if [!DEFAULT_MILL_VERSION!]==[] (
+    set "DEFAULT_MILL_VERSION=0.11.4"
+)
+
+if [!GITHUB_RELEASE_CDN!]==[] (
+    set "GITHUB_RELEASE_CDN="
+)
+
+if [!MILL_MAIN_CLI!]==[] (
+    set "MILL_MAIN_CLI=%~f0"
+)
+
+set "MILL_REPO_URL=https://github.com/com-lihaoyi/mill"
+
+rem %~1% removes surrounding quotes
+if [%~1%]==[--mill-version] (
+  if not [%~2%]==[] (
+    set MILL_VERSION=%~2%
+    rem shift command doesn't work within parentheses
+    set "STRIP_VERSION_PARAMS=true"
+  ) else (
+    echo You specified --mill-version without a version. 1>&2
+    echo Please provide a version that matches one provided on 1>&2
+    echo %MILL_REPO_URL%/releases 1>&2
+    exit /b 1
+  )
+)
+
+if not defined STRIP_VERSION_PARAMS GOTO AfterStripVersionParams
+rem strip the: --mill-version {version}
+shift
+shift
+:AfterStripVersionParams
+
+if [!MILL_VERSION!]==[] (
+  if exist .mill-version (
+      set /p MILL_VERSION=<.mill-version
+  ) else (
+    if exist .config\mill-version (
+      set /p MILL_VERSION=<.config\mill-version
+    )
+  )
+)
+
+if [!MILL_VERSION!]==[] (
+    set MILL_VERSION=%DEFAULT_MILL_VERSION%
+)
+
+if [!MILL_DOWNLOAD_PATH!]==[] (
+    set MILL_DOWNLOAD_PATH=%USERPROFILE%\.mill\download
+)
+
+rem without bat file extension, cmd doesn't seem to be able to run it
+set MILL=%MILL_DOWNLOAD_PATH%\!MILL_VERSION!.bat
+
+if not exist "%MILL%" (
+    set VERSION_PREFIX=%MILL_VERSION:~0,4%
+    rem Since 0.5.0
+    set DOWNLOAD_SUFFIX=-assembly
+    rem Since 0.11.0
+    set DOWNLOAD_FROM_MAVEN=1
+    if [!VERSION_PREFIX!]==[0.0.] (
+        set DOWNLOAD_SUFFIX=
+        set DOWNLOAD_FROM_MAVEN=0
+    )
+    if [!VERSION_PREFIX!]==[0.1.] (
+        set DOWNLOAD_SUFFIX=
+        set DOWNLOAD_FROM_MAVEN=0
+    )
+    if [!VERSION_PREFIX!]==[0.2.] (
+        set DOWNLOAD_SUFFIX=
+        set DOWNLOAD_FROM_MAVEN=0
+    )
+    if [!VERSION_PREFIX!]==[0.3.] (
+        set DOWNLOAD_SUFFIX=
+        set DOWNLOAD_FROM_MAVEN=0
+   )
+    if [!VERSION_PREFIX!]==[0.4.] (
+        set DOWNLOAD_SUFFIX=
+        set DOWNLOAD_FROM_MAVEN=0
+    )
+    if [!VERSION_PREFIX!]==[0.5.] (
+        set DOWNLOAD_FROM_MAVEN=0
+    )
+    if [!VERSION_PREFIX!]==[0.6.] (
+        set DOWNLOAD_FROM_MAVEN=0
+    )
+    if [!VERSION_PREFIX!]==[0.7.] (
+        set DOWNLOAD_FROM_MAVEN=0
+    )
+    if [!VERSION_PREFIX!]==[0.8.] (
+        set DOWNLOAD_FROM_MAVEN=0
+    )
+    if [!VERSION_PREFIX!]==[0.9.] (
+        set DOWNLOAD_FROM_MAVEN=0
+    )
+    set VERSION_PREFIX=%MILL_VERSION:~0,5%
+    if [!VERSION_PREFIX!]==[0.10.] (
+        set DOWNLOAD_FROM_MAVEN=0
+    )
+    set VERSION_PREFIX=%MILL_VERSION:~0,8%
+    if [!VERSION_PREFIX!]==[0.11.0-M] (
+        set DOWNLOAD_FROM_MAVEN=0
+    )
+    set VERSION_PREFIX=
+
+    for /F "delims=- tokens=1" %%A in ("!MILL_VERSION!") do set MILL_VERSION_BASE=%%A
+    for /F "delims=- tokens=2" %%A in ("!MILL_VERSION!") do set MILL_VERSION_MILESTONE=%%A
+	set VERSION_MILESTONE_START=!MILL_VERSION_MILESTONE:~0,1!
+    if [!VERSION_MILESTONE_START!]==[M] (
+        set MILL_VERSION_TAG="!MILL_VERSION_BASE!-!MILL_VERSION_MILESTONE!"
+    ) else (
+        set MILL_VERSION_TAG=!MILL_VERSION_BASE!
+    )
+
+    rem there seems to be no way to generate a unique temporary file path (on native Windows)
+    set DOWNLOAD_FILE=%MILL%.tmp
+
+    if [!DOWNLOAD_FROM_MAVEN!]==[1] (
+        set DOWNLOAD_URL=https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/!MILL_VERSION!/mill-dist-!MILL_VERSION!.jar
+    ) else (
+        set DOWNLOAD_URL=!GITHUB_RELEASE_CDN!%MILL_REPO_URL%/releases/download/!MILL_VERSION_TAG!/!MILL_VERSION!!DOWNLOAD_SUFFIX!
+    )
+
+    echo Downloading mill %MILL_VERSION% from !DOWNLOAD_URL! ... 1>&2
+
+    if not exist "%MILL_DOWNLOAD_PATH%" mkdir "%MILL_DOWNLOAD_PATH%"
+    rem curl is bundled with recent Windows 10
+    rem but I don't think we can expect all the users to have it in 2019
+    where /Q curl
+    if %ERRORLEVEL% EQU 0 (
+        curl -f -L "!DOWNLOAD_URL!" -o "!DOWNLOAD_FILE!"
+    ) else (
+        rem bitsadmin seems to be available on Windows 7
+        rem without /dynamic, github returns 403
+        rem bitsadmin is sometimes needlessly slow but it looks better with /priority foreground
+        bitsadmin /transfer millDownloadJob /dynamic /priority foreground "!DOWNLOAD_URL!" "!DOWNLOAD_FILE!"
+    )
+    if not exist "!DOWNLOAD_FILE!" (
+        echo Could not download mill %MILL_VERSION% 1>&2
+        exit /b 1
+    )
+
+    move /y "!DOWNLOAD_FILE!" "%MILL%"
+
+    set DOWNLOAD_FILE=
+    set DOWNLOAD_SUFFIX=
+)
+
+set MILL_DOWNLOAD_PATH=
+set MILL_VERSION=
+set MILL_REPO_URL=
+
+rem Need to preserve the first position of those listed options
+set MILL_FIRST_ARG=
+if [%~1%]==[--bsp] (
+  set MILL_FIRST_ARG=%1%
+) else (
+  if [%~1%]==[-i] (
+    set MILL_FIRST_ARG=%1%
+  ) else (
+    if [%~1%]==[--interactive] (
+      set MILL_FIRST_ARG=%1%
+    ) else (
+      if [%~1%]==[--no-server] (
+        set MILL_FIRST_ARG=%1%
+      ) else (
+        if [%~1%]==[--repl] (
+          set MILL_FIRST_ARG=%1%
+        ) else (
+          if [%~1%]==[--help] (
+            set MILL_FIRST_ARG=%1%
+          )
+        )
+      )
+    )
+  )
+)
+
+set "MILL_PARAMS=%*%"
+
+if not [!MILL_FIRST_ARG!]==[] (
+  if defined STRIP_VERSION_PARAMS (
+    for /f "tokens=1-3*" %%a in ("%*") do (
+        set "MILL_PARAMS=%%d"
+    )
+  ) else (
+    for /f "tokens=1*" %%a in ("%*") do (
+      set "MILL_PARAMS=%%b"
+    )
+  )
+) else (
+  if defined STRIP_VERSION_PARAMS (
+    for /f "tokens=1-2*" %%a in ("%*") do (
+        rem strip %%a - It's the "--mill-version" option.
+        rem strip %%b - it's the version number that comes after the option.
+        rem keep  %%c - It's the remaining options.
+        set "MILL_PARAMS=%%c"
+    )
+  )
+)
+
+"%MILL%" %MILL_FIRST_ARG% -D "mill.main.cli=%MILL_MAIN_CLI%" %MILL_PARAMS%
\ No newline at end of file