Author: jfrederic.clere(a)jboss.com
Date: 2009-01-28 03:53:54 -0500 (Wed, 28 Jan 2009)
New Revision: 2234
Modified:
trunk/mod_cluster/test/java/installhttpd.sh
Log:
The "postinstall" logic also need to be called when install from a directory.
Modified: trunk/mod_cluster/test/java/installhttpd.sh
===================================================================
--- trunk/mod_cluster/test/java/installhttpd.sh 2009-01-28 07:36:50 UTC (rev 2233)
+++ trunk/mod_cluster/test/java/installhttpd.sh 2009-01-28 08:53:54 UTC (rev 2234)
@@ -146,13 +146,30 @@
rm -rf "$BASELOC/$BASEHTTPD"
case ${EXT} in
file)
- rm -rf $BASELOC/opt
- cp -rp $root/opt $BASELOC
+ cp -rp $root/* $BASELOC
+ case $BUILD_TAG in
+ *windows*)
+ EXT=zip
+ ;;
+ *)
+ EXT=tar.gz
+ ;;
+ esac
;;
tar.gz)
(cd $BASELOC
gzip -dc ${TARBALL} | tar xvf -
)
+ ;;
+ *)
+ (cd "$BASELOC"
+ unzip ${TARBALL}
+ )
+ ;;
+esac
+
+case ${EXT} in
+ tar.gz)
# Arrange the installed files
files="${BASEHTTPDSBIN}/apachectl ${BASEHTTPDCONF}/httpd.conf
${BASEHTTPDSBIN}/envvars"
for FILE in `echo $files`
@@ -173,9 +190,6 @@
mv $file.new $file
;;
*)
- (cd "$BASELOC"
- unzip ${TARBALL}
- )
# Arrange the installed files
(cd "$BASELOC/httpd-2.2/bin"
./installconf.bat
Show replies by date