summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorLISA STILLWELL <lisa@dhcp152-54-9-239.europa.renci.org>2012-10-19 18:45:45 (GMT)
committer LISA STILLWELL <lisa@dhcp152-54-9-239.europa.renci.org>2012-10-19 18:45:45 (GMT)
commit020813f7f1a8e8d458f3e2afa0ef1a7c99827ff6 (patch)
tree9d179754982fdf684d1ca25ce54407ebead3b3ed /packaging
parentaddbacbb055c2d3f67906802bc0034694532ecb9 (diff)
downloadQCG-Data-020813f7f1a8e8d458f3e2afa0ef1a7c99827ff6.zip
QCG-Data-020813f7f1a8e8d458f3e2afa0ef1a7c99827ff6.tar.gz
QCG-Data-020813f7f1a8e8d458f3e2afa0ef1a7c99827ff6.tar.bz2
[#769] only set up proxy host for maven if provided
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/build.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/packaging/build.sh b/packaging/build.sh
index fb4c779..db7206b 100755
--- a/packaging/build.sh
+++ b/packaging/build.sh
@@ -81,9 +81,12 @@ if [[ "$?" != "0" || `echo $MAVEN | awk '{print $1}'` == "no" ]] ; then
# create the .m2 dir
mvn --version > /dev/null 2>&1
- # save old maven settings file if one exists
- mv ~/.m2/settings.xml save_settings.xml > /dev/null 2>&1
- echo $UGLYSETTINGSFILESTRING > ~/.m2/settings.xml
+ # if proxy specified set it up in settings.xml
+ if [[ $PROXYHOST ]]; then
+ # save old maven settings file if one exists
+ mv ~/.m2/settings.xml save_settings.xml > /dev/null 2>&1
+ echo $UGLYSETTINGSFILESTRING > ~/.m2/settings.xml
+ fi
else
MAVENVERSION=`mvn --version`
echo "Detected maven [$MAVEN] version[$MAVENVERSION]"