use scala-cli jar launcher (TODO: download automatically)

Author: bishabosha

dist/bin/cli-common

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-SCALA_CLI_LAUNCHER="/Users/jamie/workspace/scala-cli/out/cli/3.3.3/launcher.dest/launcher"
-
 #/*--------------------------------------------------------------------------
 # *  Credits: This script is based on the script generated by sbt-pack.
 # *--------------------------------------------------------------------------*/
@@ -25,6 +23,136 @@ function onExit() {
   exit $scala_exit_status
 }
 
+#/*--------------------------------------------------------------------------
+# *  SECTION FOR JAVA COMMAND
+# *--------------------------------------------------------------------------*/
+
+# to reenable echo if we are interrupted before completing.
+trap onExit INT TERM EXIT
+
+unset cygwin mingw msys darwin conemu
+
+# COLUMNS is used together with command line option '-pageWidth'.
+if command -v tput >/dev/null 2>&1; then
+  export COLUMNS="$(tput -Tdumb cols)"
+fi
+
+case "`uname`" in
+  CYGWIN*) cygwin=true
+          ;;
+  MINGW*) mingw=true
+          ;;
+  MSYS*) msys=true
+          ;;
+  Darwin*) darwin=true
+           if [ -z "$JAVA_VERSION" ] ; then
+             JAVA_VERSION="CurrentJDK"
+           else
+            echo "Using Java version: $JAVA_VERSION" 1>&2
+           fi
+           if [ -z "$JAVA_HOME" ] ; then
+             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
+           fi
+           JAVACMD="`which java`"
+           ;;
+esac
+
+unset CYGPATHCMD
+if [[ ${cygwin-} || ${mingw-} || ${msys-} ]]; then
+  # ConEmu terminal is incompatible with jna-5.*.jar
+  [[ (${CONEMUANSI-} || ${ConEmuANSI-}) ]] && conemu=true
+  # cygpath is used by various windows shells: cygwin, git-sdk, gitbash, msys, etc.
+  CYGPATHCMD=`which cygpath 2>/dev/null`
+  case "$TERM" in
+    rxvt* | xterm* | cygwin*)
+      stty -icanon min 1 -echo
+      JAVA_OPTS="$JAVA_OPTS -Djline.terminal=unix"
+    ;;
+  esac
+fi
+
+# Resolve JAVA_HOME from javac command path
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" -a -f "$javaExecutable" -a ! "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      javaExecutable="`readlink -f \"$javaExecutable\"`"
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "${JAVACMD-}" ] ; then
+  if [ -n "${JAVA_HOME-}"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly."
+  echo "  We cannot execute $JAVACMD"
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSPATH_SUFFIX=""
+# Path separator used in EXTRA_CLASSPATH
+PSEP=":"
+
+# translate paths to Windows-mixed format before running java
+if [ -n "${CYGPATHCMD-}" ]; then
+  [ -n "${PROG_HOME-}" ] &&
+    PROG_HOME=`"$CYGPATHCMD" -am "$PROG_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`"$CYGPATHCMD" -am "$JAVA_HOME"`
+  CLASSPATH_SUFFIX=";"
+  PSEP=";"
+elif [[ ${mingw-} || ${msys-} ]]; then
+  # For Mingw / Msys, convert paths from UNIX format before anything is touched
+  [ -n "$PROG_HOME" ] &&
+    PROG_HOME="`(cd "$PROG_HOME"; pwd -W | sed 's|/|\\\\|g')`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd -W | sed 's|/|\\\\|g')`"
+  CLASSPATH_SUFFIX=";"
+  PSEP=";"
+fi
+
+#/*--------------------------------------------------
+# * The code below is for Dotty
+# *-------------------------------------------------*/
+
+find_lib () {
+  for lib in "$PROG_HOME"/lib/$1 ; do
+    if [[ -f "$lib" ]]; then
+      if [ -n "$CYGPATHCMD" ]; then
+        "$CYGPATHCMD" -am "$lib"
+      elif [[ $mingw ||  $msys ]]; then
+        echo "$lib" | sed 's|/|\\\\|g'
+      else
+        echo "$lib"
+      fi
+      return
+    fi
+  done
+}
+
+SCALA_CLI_JAR=$(find_lib "*scala-cli*")
+
 declare -a scala_args
 
 addScala () {

dist/bin/scala

@@ -54,7 +54,8 @@ done
 
 # exec here would prevent onExit from being called, leaving terminal in unusable state
 [ -z "${ConEmuPID-}" -o -n "${cygwin-}" ] && export MSYSTEM= PWD= # workaround for #12405
-eval "\"$SCALA_CLI_LAUNCHER\"" \
+eval "\"$JAVACMD\"" \
+  "-jar \"$SCALA_CLI_JAR\"" \
   "--cli-default-scala-version \"$SCALA_VERSION\"" \
   "-r \"$MVN_REPOSITORY\"" \
   "${scala_args[@]}"