inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)

Browse Source 
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
This commit is contained in:
Mark Rogers
2016-03-15 11:50:27 +00:00
parent 4c4ee311c1
commit dbb45ae1b4
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
enterprise-update-test/pom.xml
View File

@@ -142,12 +142,17 @@
<echo>Is base.installer.version provided ?</echo> <echo>Is base.installer.version provided ?</echo>
<if> <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> <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> </then>
</if> </if>
<!-- Download and install the base version of alfresco --> <!-- Download and install the base version of alfresco -->
<if> <if>
<not> <not>
@@ -159,7 +164,7 @@
</if> </if>
<echo>Downloading Base Alfresco installer ${base.installer.version}...</echo> <echo>Downloading Base Alfresco installer ${base.installer.version}...</echo>
<exec executable="wget" dir="target"> <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> </exec>
<chmod file="${base.installer.location}" perm="a+x" verbose="true" /> <chmod file="${base.installer.location}" perm="a+x" verbose="true" />
@@ -167,7 +172,7 @@
<exec executable="${base.installer.location}" dir="target" failonerror="true"> <exec executable="${base.installer.location}" dir="target" failonerror="true">
<arg line="${installer.args} --prefix ${base.alfresco.instance} " /> <arg line="${installer.args} --prefix ${base.alfresco.instance} " />
</exec> </exec>
<if> <if>
<not> <not>
<isset property="this.installer.location" /> <isset property="this.installer.location" />
@@ -178,7 +183,7 @@
<include name="alfresco-*.bin"/> <include name="alfresco-*.bin"/>
</fileset> </fileset>
</path> </path>
<property name="this.installer.location" location="${this.installer.name}" /> <property name="this.installer.location" refid="this.installer.name" />
</then> </then>
</if> </if>