Author: jfrederic.clere(a)jboss.com
Date: 2009-02-25 05:01:43 -0500 (Wed, 25 Feb 2009)
New Revision: 2321
Modified:
trunk/mod_cluster/test/java/installhttpd.sh
Log:
Don't remove if download failed (no build.xml for example) so that
the script could be used on existing installations.
Modified: trunk/mod_cluster/test/java/installhttpd.sh
===================================================================
--- trunk/mod_cluster/test/java/installhttpd.sh 2009-02-25 09:34:23 UTC (rev 2320)
+++ trunk/mod_cluster/test/java/installhttpd.sh 2009-02-25 10:01:43 UTC (rev 2321)
@@ -139,12 +139,17 @@
#
TARBALL=http://hudson.qa.jboss.com/hudson/view/Native/job/${BASE}/lastSuc...
BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::'`
+REMOVE=true
if [ "x${BASELOC}" = "x" ]
then
BASELOC=`pwd`
if [ ! -f ${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT} ]
then
ant downloadfile -Dsourcefile=${TARBALL}
-Ddestfile=${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT} -Ddestdir="$BASELOC"
+ if [ ! -f ${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT} ]
+ then
+ REMOVE=false
+ fi
fi
else
if [ "x${BUILDTEST}" = "N" ]
@@ -162,7 +167,10 @@
echo "Base is: $BASELOC !!!"
# Clean previous install
-rm -rf "$BASELOC/$BASEHTTPD"
+if $REMOVE
+then
+ rm -rf "$BASELOC/$BASEHTTPD"
+fi
case ${EXT} in
file)
cp -rp $root/* "$BASELOC"