Merge branch 'common-build-script' into 2.8.x

Author: paulp

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 ]] || {
@@ -20,7 +21,19 @@ version="$1"
 }
 
 # should not be hardcoded
-mavenSettings="/home/linuxsoft/apps/hudson-maven-settings/settings.xml"
+# adds -Dsettings.file= if fixed path is present 
+mavenSettingsOption () {
+  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
+}
+
+mavenSettings=${maven_settings:-findMavenSettings}
 
 if [[ -z $publish_to ]]; then
   echo "Nothing to publish."
@@ -33,5 +46,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