summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-12-09 19:19:29 -0800
committerPaul Phillips <paulp@improving.org>2011-12-09 19:19:29 -0800
commit878896577ec6865899e2e4a6f9fe18574cad4ebc (patch)
tree542c9b24c387fc084ecfc03a9e36f68cb79387af /tools
parentcc7cb812a7a9564a1a60a25648c8890b6fb42121 (diff)
parent56536de18c058b5aecd86c2a967b1bf19ce601be (diff)
downloadscala-878896577ec6865899e2e4a6f9fe18574cad4ebc.tar.gz
scala-878896577ec6865899e2e4a6f9fe18574cad4ebc.tar.bz2
scala-878896577ec6865899e2e4a6f9fe18574cad4ebc.zip
Merge branch 'common-build-script'
Diffstat (limited to 'tools')
-rwxr-xr-xtools/epfl-publish11
1 files changed, 8 insertions, 3 deletions
diff --git a/tools/epfl-publish b/tools/epfl-publish
index 59ae6f138a..e9cd97b3d2 100755
--- a/tools/epfl-publish
+++ b/tools/epfl-publish
@@ -1,6 +1,7 @@
#!/usr/bin/env bash
#
# publishes nightly build if $publish_to is set in environment.
+# alternate maven settings.xml file given in $maven_settings.
#
[[ $# -eq 1 ]] || {
@@ -22,9 +23,13 @@ version="$1"
# should not be hardcoded
# 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"
+ hardcoded_path="/home/linuxsoft/apps/hudson-maven-settings/settings.xml"
+
+ # environment variable
+ if [[ -n $maven_settings ]]; then
+ echo -Dsettings.file="$maven_settings"
+ elif [[ -f $hardcoded_path ]]; then
+ echo -Dsettings.file="$hardcoded_path"
fi
}