Extract common variables to common script in bin dir

1 files changed, 2 insertions, 17 deletions

diff --git a/bin/dotr b/bin/dotr
index f1da6c8ea..90d2825e6 100755
--- a/bin/dotr
+++ b/bin/dotr
@@ -7,24 +7,9 @@ if [[ "$DOTTY_ROOT" == "" ]]; then
 fi
 DOTTY_ROOT="$(dirname "$DOTTY_ROOT")"
 DOTTY_ROOT="$( cd "$DOTTY_ROOT" >& /dev/null && pwd )/.."  # absolute
-SCALA_VERSION=$(grep "scalaVersion in" "$DOTTY_ROOT/project/Build.scala"|sed -n 's/.*\"\(.*\)\".*/\1/'p)
 
-function find_jar {
-    # Usage:
-    #   find_jar path/to/location file.jar
-    local artifact="$1/$2"
-
-    if [ ! -f "$artifact" ]; then
-        artifact=$(find "$HOME/.coursier/cache" -iname "$2")
-    fi
-
-    echo "$artifact"
-}
-
-# Autodetecting the scala-library location, in case it wasn't provided by an environment variable
-if [ "$SCALA_LIBRARY_JAR" == "" ]; then
-    SCALA_LIBRARY_JAR=$(find_jar "$HOME/.ivy2/cache/org.scala-lang/scala-library/jars" "scala-library-$SCALA_VERSION.jar")
-fi
+# Load common functions and variables
+source $DOTTY_ROOT/bin/common
 
 # CLASS_PATH is derived from the DOTTY_ROOT and SCALA_LIBRARY_JAR
 CLASS_PATH="-Xbootclasspath/a:.:$DOTTY_ROOT/target/scala-2.11/classes/:.:$SCALA_LIBRARY_JAR"