MINOR: If blackcandy isn't included, or is already in the right place, dont error out
This commit is contained in:
parent
e323b233a3
commit
71d71dc3b6
10
build.xml
10
build.xml
|
@ -139,12 +139,12 @@ Options:
|
||||||
<include name="assets/web.config" />
|
<include name="assets/web.config" />
|
||||||
</fileset>
|
</fileset>
|
||||||
</copy>
|
</copy>
|
||||||
|
|
||||||
<!-- TODO Remove once we figured out how to nest git repositories for themes -->
|
<!-- TODO Remove once we figured out how to nest git repositories for themes -->
|
||||||
<move file="${tmp}/${archivename}/themes/blackcandy/blackcandy_blog" todir="${tmp}/${archivename}/themes" />
|
<move file="${tmp}/${archivename}/themes/blackcandy/blackcandy_blog" todir="${tmp}/${archivename}/themes" haltonerror='false' />
|
||||||
<move file="${tmp}/${archivename}/themes/blackcandy/blackcandy_calendar" todir="${tmp}/${archivename}/themes" />
|
<move file="${tmp}/${archivename}/themes/blackcandy/blackcandy_calendar" todir="${tmp}/${archivename}/themes" haltonerror='false' />
|
||||||
<move file="${tmp}/${archivename}/themes/blackcandy/blackcandy" todir="${tmp}/${archivename}/themes" />
|
<move file="${tmp}/${archivename}/themes/blackcandy/blackcandy" todir="${tmp}/${archivename}/themes" haltonerror='false' />
|
||||||
|
|
||||||
<!-- create tar archive -->
|
<!-- create tar archive -->
|
||||||
<if>
|
<if>
|
||||||
<equals arg1="${archivetype}" arg2="tar.gz" casesensitive="false" trim="true"/>
|
<equals arg1="${archivetype}" arg2="tar.gz" casesensitive="false" trim="true"/>
|
||||||
|
|
Loading…
Reference in New Issue