From 9a5fcfdee992884f22b9135790b0eac617740b4b Mon Sep 17 00:00:00 2001
From: Nathaniel Fischer <nfischer921@gmail.com>
Date: Thu, 5 Sep 2019 12:00:36 -0700
Subject: Make mill wrapper backwards compatible (#670)

* Make mill wrapper backwards compatible

resolves https://github.com/lihaoyi/mill/issues/669

* more intelligent version comparison
---
 mill | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mill b/mill
index e9690032..edba1475 100755
--- a/mill
+++ b/mill
@@ -20,10 +20,17 @@ fi
 MILL_DOWNLOAD_PATH="$HOME/.mill/download"
 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#*.}"
+
 if [ ! -x "$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_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"
   mv "$DOWNLOAD_FILE" "$MILL_EXEC_PATH"
-- 
cgit v1.2.3