From dbb45ae1b4a30d7d3eaa0f033b4751e17fd6a464 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Tue, 15 Mar 2016 11:50:27 +0000
Subject: [PATCH] Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)    122730 jphuynh:
 BDE-539: Fixed path and added base version extension check.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123997 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 enterprise-update-test/pom.xml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/enterprise-update-test/pom.xml b/enterprise-update-test/pom.xml
index ea0d3bd7db..690861c11c 100644
--- a/enterprise-update-test/pom.xml
+++ b/enterprise-update-test/pom.xml
@@ -142,12 +142,17 @@
                 
                 <echo>Is base.installer.version provided ?</echo>
                 <if>
-                  <equals arg1="${base.installer.version}" arg2=""/>
+                  <or>
+                    <equals arg1="${base.installer.version}" arg2=""/>
+                    <not>
+                        <matches string="${base.installer.version}" pattern="^*.bin$"/>
+                    </not>
+                  </or>
                   <then>
-                    <fail message="Missing Alfresco Base version. Example: -Dbase.installer.version=Enterprise-5.0/5.0.3" />
+                    <fail message="Missing Alfresco Base version. Example: -Dbase.installer.version=Enterprise-5.0/5.0.3/build-00084/ALL/alfresco-enterprise-5.0.3-installer-linux-x64.bin" />
                   </then>
                 </if>
-                                
+
                 <!-- Download and install the base version of alfresco -->
                 <if>
                   <not>
@@ -159,7 +164,7 @@
                 </if>
                 <echo>Downloading Base Alfresco installer ${base.installer.version}...</echo>
                 <exec executable="wget" dir="target">
-                    <arg line="-r -nv -nd -np -A bin -O base-alf-installer.bin https://releases.alfresco.com/${base.installer.version}/" />
+                    <arg line="-nv -nd -np -O base-alf-installer.bin https://releases.alfresco.com/${base.installer.version}" />
                 </exec>
                 <chmod file="${base.installer.location}" perm="a+x" verbose="true" />
 
@@ -167,7 +172,7 @@
                 <exec executable="${base.installer.location}" dir="target" failonerror="true">
                   <arg line="${installer.args} --prefix ${base.alfresco.instance} " />
                 </exec>
-                
+
                 <if>
                   <not>
                     <isset property="this.installer.location" />
@@ -178,7 +183,7 @@
                             <include name="alfresco-*.bin"/> 
                         </fileset>
                     </path>
-                    <property name="this.installer.location" location="${this.installer.name}" />
+                    <property name="this.installer.location" refid="this.installer.name" />
                   </then>
                 </if>