Author: jfrederic.clere(a)jboss.com
Date: 2009-01-28 02:36:50 -0500 (Wed, 28 Jan 2009)
New Revision: 2233
Modified:
trunk/mod_cluster/test/java/installhttpd.sh
Log:
Arrange locations.
Modified: trunk/mod_cluster/test/java/installhttpd.sh
===================================================================
--- trunk/mod_cluster/test/java/installhttpd.sh 2009-01-27 22:42:39 UTC (rev 2232)
+++ trunk/mod_cluster/test/java/installhttpd.sh 2009-01-28 07:36:50 UTC (rev 2233)
@@ -133,8 +133,8 @@
rm -f ${PACKAGE}-${BUILD_SYS}-${BUILD_CPU}.${EXT}
ant downloadfile -Dsourcefile=${TARBALL}
-Ddestfile=${PACKAGE}-${BUILD_SYS}-${BUILD_CPU}.${EXT} -Ddestdir=$BASELOC
else
- echo "Using $root/${PACKAGE}-${BUILD_SYS}-${BUILD_CPU}.${EXT}"
- cp -p $root/${PACKAGE}-${BUILD_SYS}-${BUILD_CPU}.${EXT} .
+ echo "Using $root"
+ EXT=file
fi
fi
TARBALL=`pwd`/${PACKAGE}-${BUILD_SYS}-${BUILD_CPU}.${EXT}
@@ -145,6 +145,10 @@
# Clean previous install
rm -rf "$BASELOC/$BASEHTTPD"
case ${EXT} in
+ file)
+ rm -rf $BASELOC/opt
+ cp -rp $root/opt $BASELOC
+ ;;
tar.gz)
(cd $BASELOC
gzip -dc ${TARBALL} | tar xvf -
Show replies by date