diff options
| author | Josh Suereth <joshua.suereth@gmail.com> | 2012-09-12 12:14:33 -0400 |
|---|---|---|
| committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-09-13 12:18:24 -0400 |
| commit | be9bab150e25df802a92070ea865a8a37487de7e (patch) | |
| tree | 548d74bee5be167eaddb4374cf6877dca5f474ab | |
| parent | de87eec36407316873de3eba94d620553ed1ecb8 (diff) | |
| download | scala-be9bab150e25df802a92070ea865a8a37487de7e.tar.gz scala-be9bab150e25df802a92070ea865a8a37487de7e.tar.bz2 scala-be9bab150e25df802a92070ea865a8a37487de7e.zip | |
Fixes binary repo push for new typesafe repo layouts.
This adds a new/fixed push.jar and adapts the binary-repo-lib script to use different URLs
for pulling than pushing.
This also adjustst the script to attempt the backup repo in case new artifacts haven't
synched to the fast/stable repository.
Conflicts:
tools/binary-repo-lib.sh
| -rwxr-xr-x | tools/binary-repo-lib.sh | 22 | ||||
| -rw-r--r-- | tools/push.jar.desired.sha1 | 2 |
2 files changed, 15 insertions, 9 deletions
diff --git a/tools/binary-repo-lib.sh b/tools/binary-repo-lib.sh index 3a75593f21..2dc0bd0651 100755 --- a/tools/binary-repo-lib.sh +++ b/tools/binary-repo-lib.sh @@ -3,7 +3,8 @@ # Library to push and pull binary artifacts from a remote repository using CURL. -remote_urlbase="http://typesafe.artifactoryonline.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap" +remote_urlget="http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap" +remote_urlpush="http://typesafe.artifactoryonline.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" @@ -34,8 +35,8 @@ curlUpload() { local data=$2 local user=$3 local password=$4 - local url="${remote_urlbase}/${remote_location}" - java -jar $push_jar "$data" "$remote_location" "$user" "$password" + local url="${remote_urlpush}/${remote_location}" + java -jar $push_jar "$data" "$url" "$user" "$password" if (( $? != 0 )); then echo "Error uploading $data to $url" echo "$url" @@ -77,7 +78,7 @@ pushJarFile() { local jar_sha1=$(shasum -p $jar_name) local version=${jar_sha1% ?$jar_name} local remote_uri=${version}${jar#$basedir} - echo " Pushing to ${remote_urlbase}/${remote_uri} ..." + echo " Pushing to ${remote_urlpush}/${remote_uri} ..." echo " $curl" curlUpload $remote_uri $jar_name $user $pw echo " Making new sha1 file ...." @@ -113,7 +114,7 @@ pushJarFiles() { local user=$2 local password=$3 # TODO - ignore target/ and build/ - local jarFiles="$(find ${basedir}/lib -name "*.jar") $(find ${basedir}/test/files -name "*.jar")" + local jarFiles="$(find ${basedir}/lib -name "*.jar") $(find ${basedir}/test/files -name "*.jar") $(find ${basedir}/tools -name "*.jar")" local changed="no" for jar in $jarFiles; do local valid=$(isJarFileValid $jar) @@ -142,9 +143,14 @@ pullJarFileToCache() { if [[ ! -d $cdir ]]; then mkdir -p $cdir fi - # TODO - Check SHA of local cache is accurate. - if [[ ! -f $cache_loc ]]; then - curlDownload $cache_loc ${remote_urlbase}/${uri} + if [[ ! -f "$cache_loc" ]]; then + # Note: After we follow up with JFrog, we should check the more stable raw file server first + # before hitting the more flaky artifactory. + curlDownload $cache_loc ${remote_urlpush}/${uri} + if test "$(checkJarSha "$cache_loc" "$sha")" != "OK"; then + echo "Trouble downloading $uri. Please try pull-binary-libs again when your internet connection is stable." + exit 2 + fi fi echo "$cache_loc" } diff --git a/tools/push.jar.desired.sha1 b/tools/push.jar.desired.sha1 index 53d566f525..63e6a47372 100644 --- a/tools/push.jar.desired.sha1 +++ b/tools/push.jar.desired.sha1 @@ -1 +1 @@ -de5d3eb21a732e4bce44c283ccfbd1ed94bfeaed ?push.jar +a1883f4304d5aa65e1f6ee6aad5900c62dd81079 ?push.jar |