diff options
| author | Paul Phillips <paulp@improving.org> | 2011-12-08 17:26:28 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-12-08 17:26:28 -0800 |
| commit | 210cdce586fb7a01c2fbf04fb739c10ebe0dfc34 (patch) | |
| tree | 4e8754ed4332dfcf744da3cea7db2d9c0e8ea9c5 /tools | |
| parent | 8e709180304327fd07c741f9817bbc74adca584e (diff) | |
| parent | f71d2459e1747b8c766c5f7e77def720362159ae (diff) | |
| download | scala-210cdce586fb7a01c2fbf04fb739c10ebe0dfc34.tar.gz scala-210cdce586fb7a01c2fbf04fb739c10ebe0dfc34.tar.bz2 scala-210cdce586fb7a01c2fbf04fb739c10ebe0dfc34.zip | |
Merge remote-tracking branch 'jsuereth/dont_resolve_non_lib_dirs'
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/binary-repo-lib.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/binary-repo-lib.sh b/tools/binary-repo-lib.sh index 1f4733ff3b..79a37dd7df 100755 --- a/tools/binary-repo-lib.sh +++ b/tools/binary-repo-lib.sh @@ -111,7 +111,7 @@ pushJarFiles() { local user=$2 local password=$3 # TODO - ignore target/ and build/ - local jarFiles=$(find ${basedir} -name "*.jar") + local jarFiles="$(find ${basedir}/lib -name "*.jar") $(find ${basedir}/test/files -name "*.jar")" for jar in $jarFiles; do local valid=$(isJarFileValid $jar) if [[ "$valid" != "OK" ]]; then @@ -141,7 +141,7 @@ pullJarFile() { # Argument 1 - The directory to search for *.desired.sha1 files that need to be retrieved. pullJarFiles() { local basedir=$1 - local desiredFiles=$(find ${basedir} -name "*${desired_ext}") + local desiredFiles="$(find ${basedir}/lib -name *${desired_ext}) $(find ${basedir}/test/files -name *${desired_ext})" for sha in $desiredFiles; do jar=${sha%$desired_ext} local valid=$(isJarFileValid $jar) |