diff options
| author | Paul Phillips <paulp@improving.org> | 2011-12-09 19:14:46 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-12-09 19:15:22 -0800 |
| commit | 59348d0160b3f7d7c78f29f866017d88b16dd9b0 (patch) | |
| tree | 2b3d4f0ddcc67bcad1e41cd500f0bfbc292dbb37 | |
| parent | 9c15462891afd368d1e7d0ac3914613202428b24 (diff) | |
| download | scala-59348d0160b3f7d7c78f29f866017d88b16dd9b0.tar.gz scala-59348d0160b3f7d7c78f29f866017d88b16dd9b0.tar.bz2 scala-59348d0160b3f7d7c78f29f866017d88b16dd9b0.zip | |
Boiling more logic out of jenkins.
Offer explicit settings.xml path for maven if some specific
hardcoded path exists, don't otherwise. At least it's in one
place where we can keep an eye on it.
| -rwxr-xr-x | tools/epfl-publish | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tools/epfl-publish b/tools/epfl-publish index 2c0141e264..59ae6f138a 100755 --- a/tools/epfl-publish +++ b/tools/epfl-publish @@ -20,7 +20,15 @@ version="$1" } # should not be hardcoded -mavenSettings="/home/linuxsoft/apps/hudson-maven-settings/settings.xml" +# adds -Dsettings.file= if fixed path is present +mavenSettingsOption () { + path="/home/linuxsoft/apps/hudson-maven-settings/settings.xml" + if [[ -f $path ]]; then + echo -Dsettings.file="$path" + fi +} + +mavenSettings=${maven_settings:-findMavenSettings} if [[ -z $publish_to ]]; then echo "Nothing to publish." @@ -33,5 +41,5 @@ else # sbaz [[ -d dists/sbaz ]] && rsync -az dists/sbaz/ "$publish_to/sbaz" # Deploy the maven artifacts on scala-tools.org - ( cd dists/maven/latest && ant deploy.snapshot -Dsettings.file="$mavenSettings" ) + ( cd dists/maven/latest && ant deploy.snapshot $(mavenSettingsOption) ) fi |