diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-02-02 11:13:23 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-02-02 11:13:23 +1000 |
| commit | 70f960cfd1d43ee1b873c22a471c8350a966b2a7 (patch) | |
| tree | 99be5b41a9b55236ef2abb9e6978a90eb12184a8 /tools | |
| parent | 8b5f2b435b4b14089806406c8923f7e845d10ef6 (diff) | |
| parent | 41766537c03e5ed953cc806c2a8629b115097996 (diff) | |
| download | scala-70f960cfd1d43ee1b873c22a471c8350a966b2a7.tar.gz scala-70f960cfd1d43ee1b873c22a471c8350a966b2a7.tar.bz2 scala-70f960cfd1d43ee1b873c22a471c8350a966b2a7.zip | |
Merge pull request #4272 from retronym/merge/2.11.x-to-2.12.x-20150129
Merge 2.11.x to 2.12.x
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/binary-repo-lib.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/binary-repo-lib.sh b/tools/binary-repo-lib.sh index 654ba21547..437c0a0c08 100755 --- a/tools/binary-repo-lib.sh +++ b/tools/binary-repo-lib.sh @@ -2,15 +2,16 @@ # # Library to push and pull binary artifacts from a remote repository using CURL. - remote_urlget="http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap" remote_urlpush="http://private-repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap" libraryJar="$(pwd)/lib/scala-library.jar" desired_ext=".desired.sha1" push_jar="$(pwd)/tools/push.jar" + if [[ "$OSTYPE" == *Cygwin* || "$OSTYPE" == *cygwin* ]]; then push_jar="$(cygpath -m "$push_jar")"; fi # Cache dir has .sbt in it to line up with SBT build. -cache_dir="${HOME}/.sbt/cache/scala" +SCALA_BUILD_REPOS_HOME=${SCALA_BUILD_REPOS_HOME:=$HOME} +cache_dir="${SCALA_BUILD_REPOS_HOME}/.sbt/cache/scala" # Checks whether or not curl is installed and issues a warning on failure. checkCurl() { |