build(deps): updates lein

lein.sh

@@ -4,13 +4,9 @@
 # somewhere on your $PATH, like ~/bin. The rest of Leiningen will be
 # installed upon first run into the ~/.lein/self-installs directory.
 
-function msg {
-    echo "$@" 1>&2
-}
-
-export LEIN_VERSION="2.9.10"
+export LEIN_VERSION="2.11.2"
 # Must be sha256sum, will be replaced by bin/release
-export LEIN_CHECKSUM='a228530f00b50753acfddc3de38a0d737b6f5c1aec49af202e70a0ad28c249c9'
+export LEIN_CHECKSUM='7d31ae23ae769e927438b0cd55d15a93e7dabab09fd4fc15877979161e108774'
 
 case $LEIN_VERSION in
     *SNAPSHOT) SNAPSHOT="YES" ;;
@@ -36,6 +32,10 @@ else
   cygwin=false
 fi
 
+function msg {
+    echo "$@" 1>&2
+}
+
 function command_not_found {
     msg "Leiningen couldn't find $1 in your \$PATH ($PATH), which is required."
     exit 1
@@ -119,87 +119,7 @@ function self_install {
   fi
 }
 
-NOT_FOUND=1
-ORIGINAL_PWD="$PWD"
-while [ ! -r "$PWD/project.clj" ] && [ "$PWD" != "/" ] && [ $NOT_FOUND -ne 0 ]
-do
-    cd ..
-    if [ "$(dirname "$PWD")" = "/" ]; then
-        NOT_FOUND=0
-        cd "$ORIGINAL_PWD"
-    fi
-done
-
-export LEIN_HOME="${LEIN_HOME:-"$HOME/.lein"}"
-
-for f in "/etc/leinrc" "$LEIN_HOME/leinrc" ".leinrc"; do
-  if [ -e "$f" ]; then
-    source "$f"
-  fi
-done
-
-if $cygwin; then
-    export LEIN_HOME=$(cygpath -w "$LEIN_HOME")
-fi
-
-LEIN_JAR="${LEIN_JAR:-${LEIN_HOME}/self-installs/leiningen-${LEIN_VERSION}-standalone.jar}"
-
-# normalize $0 on certain BSDs
-if [ "$(dirname "$0")" = "." ]; then
-    SCRIPT="$(which "$(basename "$0")")"
-    if [ -z "$SCRIPT" ]; then
-        SCRIPT="$0"
-    fi
-else
-    SCRIPT="$0"
-fi
-
-# resolve symlinks to the script itself portably
-while [ -h "$SCRIPT" ] ; do
-    ls=$(ls -ld "$SCRIPT")
-    link=$(expr "$ls" : '.*-> \(.*\)$')
-    if expr "$link" : '/.*' > /dev/null; then
-        SCRIPT="$link"
-    else
-        SCRIPT="$(dirname "$SCRIPT"$)/$link"
-    fi
-done
-
-BIN_DIR="$(dirname "$SCRIPT")"
-
-export LEIN_JVM_OPTS="${LEIN_JVM_OPTS-"-XX:+TieredCompilation -XX:TieredStopAtLevel=1"}"
-
-# This needs to be defined before we call HTTP_CLIENT below
-if [ "$HTTP_CLIENT" = "" ]; then
-    if type -p curl >/dev/null 2>&1; then
-        if [ "$https_proxy" != "" ]; then
-            CURL_PROXY="-x $https_proxy"
-        fi
-        HTTP_CLIENT="curl $CURL_PROXY -f -L -o"
-    else
-        HTTP_CLIENT="wget -O"
-    fi
-fi
-
-# This needs to be defined before we call SHASUM_CMD below
-if [ "$SHASUM_CMD" = "" ]; then
-    if type -p sha256sum >/dev/null 2>&1; then
-        export SHASUM_CMD="sha256sum"
-    elif type -p shasum >/dev/null 2>&1; then
-        export SHASUM_CMD="shasum --algorithm 256"
-    elif type -p sha256 >/dev/null 2>&1; then
-        export SHASUM_CMD="sha256 -q"
-    else
-        command_not_found sha256sum
-    fi
-fi
-
-# When :eval-in :classloader we need more memory
-grep -E -q '^\s*:eval-in\s+:classloader\s*$' project.clj 2> /dev/null && \
-    export LEIN_JVM_OPTS="$LEIN_JVM_OPTS -Xms64m -Xmx512m"
-
-if [ -r "$BIN_DIR/../src/leiningen/version.clj" ]; then
-    # Running from source checkout
+function run_from_source() {
     LEIN_DIR="$(cd $(dirname "$BIN_DIR");pwd -P)"
 
     # Need to use lein release to bootstrap the leiningen-core library (for aether)
@@ -242,52 +162,17 @@ if [ -r "$BIN_DIR/../src/leiningen/version.clj" ]; then
     else
         add_path CLASSPATH "$(cat "$LEIN_DIR/leiningen-core/.lein-bootstrap" 2> /dev/null)"
     fi
-else # Not running from a checkout
+}
+
+function run_from_checkout() {
     add_path CLASSPATH "$LEIN_JAR"
 
     if [ "$LEIN_USE_BOOTCLASSPATH" != "no" ]; then
         LEIN_JVM_OPTS="-Xbootclasspath/a:$LEIN_JAR $LEIN_JVM_OPTS"
     fi
+}
 
-    if [ ! -r "$LEIN_JAR" -a "$1" != "self-install" ]; then
-        self_install
-    fi
-fi
-
-if [ ! -x "$JAVA_CMD" ] && ! type -f java >/dev/null
-then
-    msg "Leiningen couldn't find 'java' executable, which is required."
-    msg "Please either set JAVA_CMD or put java (>=1.6) in your \$PATH ($PATH)."
-    exit 1
-fi
-
-export LEIN_JAVA_CMD="${LEIN_JAVA_CMD:-${JAVA_CMD:-java}}"
-
-if [[ -z "${DRIP_INIT+x}" && "$(basename "$LEIN_JAVA_CMD")" == *drip* ]]; then
-    export DRIP_INIT="$(printf -- '-e\n(require (quote leiningen.repl))')"
-    export DRIP_INIT_CLASS="clojure.main"
-fi
-
-# Support $JAVA_OPTS for backwards-compatibility.
-export JVM_OPTS="${JVM_OPTS:-"$JAVA_OPTS"}"
-
-# Handle jline issue with cygwin not propagating OSTYPE through java subprocesses: https://github.com/jline/jline2/issues/62
-cygterm=false
-if $cygwin; then
-  case "$TERM" in
-    rxvt* | xterm* | vt*) cygterm=true ;;
-  esac
-fi
-
-if $cygterm; then
-  LEIN_JVM_OPTS="$LEIN_JVM_OPTS -Djline.terminal=jline.UnixTerminal"
-  stty -icanon min 1 -echo > /dev/null 2>&1
-fi
-
-# TODO: investigate http://skife.org/java/unix/2011/06/20/really_executable_jars.html
-# If you're packaging this for a package manager (.deb, homebrew, etc)
-# you need to remove the self-install and upgrade functionality or see lein-pkg.
-if [ "$1" = "self-install" ]; then
+function cmd_self_install() {
     if [ -r "$BIN_DIR/../src/leiningen/version.clj" ]; then
         cat <<-'EOS' 1>&2
 	Running self-install from a checkout is not supported.
@@ -297,7 +182,9 @@ if [ "$1" = "self-install" ]; then
     fi
     msg "Manual self-install is deprecated; it will run automatically when necessary."
     self_install
-elif [ "$1" = "upgrade" ] || [ "$1" = "downgrade" ]; then
+}
+
+function cmd_up_downgrade() {
     if [ "$LEIN_DIR" != "" ]; then
         msg "The upgrade task is not meant to be run from a checkout."
         exit 1
@@ -347,7 +234,9 @@ elif [ "$1" = "upgrade" ] || [ "$1" = "downgrade" ]; then
                 exit 1;;
         esac
     fi
-else
+}
+
+function cmd_run {
     if $cygwin; then
         # When running on Cygwin, use Windows-style paths for java
         ORIGINAL_PWD=$(cygpath -w "$ORIGINAL_PWD")
@@ -424,4 +313,146 @@ else
             exit $EXIT_CODE
         fi
     fi
+}
+
+# cd to the project root, if applicable
+NOT_FOUND=1
+ORIGINAL_PWD="$PWD"
+while [ ! -r "$PWD/project.clj" ] && [ "$PWD" != "/" ] && [ $NOT_FOUND -ne 0 ]
+do
+    cd ..
+    if [ "$(dirname "$PWD")" = "/" ]; then
+        NOT_FOUND=0
+        cd "$ORIGINAL_PWD"
+    fi
+done
+
+# User init
+if [ "$LEIN_HOME" = "" ]; then
+    # Prefer the old location if present
+    if [ -d "$HOME/.lein" ]; then
+        export LEIN_HOME="$HOME/.lein"
+    elif [ -d "$XDG_CACHE_HOME/leiningen" ]; then
+        export LEIN_HOME="$XDG_CACHE_HOME/leiningen"
+    else
+        export LEIN_HOME="$HOME/.lein"
+    fi
+fi
+
+for f in "/etc/leinrc" "$LEIN_HOME/leinrc" ".leinrc"; do
+  if [ -e "$f" ]; then
+    source "$f"
+  fi
+done
+
+if $cygwin; then
+    export LEIN_HOME=$(cygpath -w "$LEIN_HOME")
+fi
+
+# normalize $0 on certain BSDs
+if [ "$(dirname "$0")" = "." ]; then
+    SCRIPT="$(which "$(basename "$0")")"
+    if [ -z "$SCRIPT" ]; then
+        SCRIPT="$0"
+    fi
+else
+    SCRIPT="$0"
+fi
+
+# resolve symlinks to the script itself portably
+while [ -h "$SCRIPT" ] ; do
+    ls=$(ls -ld "$SCRIPT")
+    link=$(expr "$ls" : '.*-> \(.*\)$')
+    if expr "$link" : '/.*' > /dev/null; then
+        SCRIPT="$link"
+    else
+        SCRIPT="$(dirname "$SCRIPT"$)/$link"
+    fi
+done
+
+BIN_DIR="$(dirname "$SCRIPT")"
+
+
+LEIN_JAR="${LEIN_JAR:-${LEIN_HOME}/self-installs/leiningen-${LEIN_VERSION}-standalone.jar}"
+
+export LEIN_JVM_OPTS="${LEIN_JVM_OPTS-"-XX:+TieredCompilation -XX:TieredStopAtLevel=1"}"
+
+# This needs to be defined before we call HTTP_CLIENT below
+if [ "$HTTP_CLIENT" = "" ]; then
+    if type -p curl >/dev/null 2>&1; then
+        if [ "$https_proxy" != "" ]; then
+            CURL_PROXY="-x $https_proxy"
+        fi
+        HTTP_CLIENT="curl $CURL_PROXY -f -L -o"
+    else
+        HTTP_CLIENT="wget -O"
+    fi
+fi
+
+# This needs to be defined before we call SHASUM_CMD below
+if [ "$SHASUM_CMD" = "" ]; then
+    if type -p sha256sum >/dev/null 2>&1; then
+        export SHASUM_CMD="sha256sum"
+    elif type -p shasum >/dev/null 2>&1; then
+        export SHASUM_CMD="shasum --algorithm 256"
+    elif type -p sha256 >/dev/null 2>&1; then
+        export SHASUM_CMD="sha256 -q"
+    else
+        command_not_found sha256sum
+    fi
+fi
+
+# When :eval-in :classloader we need more memory
+grep -E -q '^\s*:eval-in\s+:classloader\s*$' project.clj 2> /dev/null && \
+    export LEIN_JVM_OPTS="$LEIN_JVM_OPTS -Xms64m -Xmx512m"
+
+if [ -r "$BIN_DIR/../src/leiningen/version.clj" ]; then
+    run_from_source "$1"
+else
+    run_from_checkout "$1"
+
+    if [ ! -r "$LEIN_JAR" -a "$1" != "self-install" ]; then
+        self_install
+    fi
+fi
+
+if [ ! -x "$JAVA_CMD" ] && ! type -f java >/dev/null
+then
+    msg "Leiningen couldn't find 'java' executable, which is required."
+    msg "Please either set JAVA_CMD or put java (>=1.6) in your \$PATH ($PATH)."
+    exit 1
+fi
+
+export LEIN_JAVA_CMD="${LEIN_JAVA_CMD:-${JAVA_CMD:-java}}"
+
+if [[ -z "${DRIP_INIT+x}" && "$(basename "$LEIN_JAVA_CMD")" == *drip* ]]; then
+    export DRIP_INIT="$(printf -- '-e\n(require (quote leiningen.repl))')"
+    export DRIP_INIT_CLASS="clojure.main"
+fi
+
+# Support $JAVA_OPTS for backwards-compatibility.
+export JVM_OPTS="${JVM_OPTS:-"$JAVA_OPTS"}"
+
+# Handle jline issue with cygwin not propagating OSTYPE through java subprocesses: https://github.com/jline/jline2/issues/62
+cygterm=false
+if $cygwin; then
+  case "$TERM" in
+    rxvt* | xterm* | vt*) cygterm=true ;;
+  esac
+fi
+
+if $cygterm; then
+  LEIN_JVM_OPTS="$LEIN_JVM_OPTS -Djline.terminal=jline.UnixTerminal"
+  stty -icanon min 1 -echo > /dev/null 2>&1
+fi
+
+# TODO: investigate http://skife.org/java/unix/2.11.26/20/really_executable_jars.html
+# If you're packaging this for a package manager (.deb, homebrew, etc)
+# you need to remove the self-install and upgrade functionality or see lein-pkg.
+if [ "$1" = "self-install" ]; then
+    cmd_self_install
+elif [ "$1" = "upgrade" ] || [ "$1" = "downgrade" ]; then
+    cmd_up_downgrade "$@"
+else
+    cmd_run "$@"
 fi