diff options
| author | Paul Phillips <paulp@improving.org> | 2011-12-09 19:16:29 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-12-09 19:16:29 -0800 |
| commit | cc7cb812a7a9564a1a60a25648c8890b6fb42121 (patch) | |
| tree | 1bdaa92b4cf57e366a80d58db09d6b03178cb3dc /tools | |
| parent | c352105fa082f88163869c0ba86f3e32aff57fc7 (diff) | |
| parent | 59348d0160b3f7d7c78f29f866017d88b16dd9b0 (diff) | |
| download | scala-cc7cb812a7a9564a1a60a25648c8890b6fb42121.tar.gz scala-cc7cb812a7a9564a1a60a25648c8890b6fb42121.tar.bz2 scala-cc7cb812a7a9564a1a60a25648c8890b6fb42121.zip | |
Merge branch 'common-build-script'
Diffstat (limited to 'tools')
| -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 |