Changeset 387 in MondoRescue for trunk/tools/livwww

Timestamp:

Feb 13, 2006, 1:21:51 AM (18 years ago)

Author:

bcornec

Message:

merge -r372:374 $SVN_M/branches/stable
merge -r384:386 $SVN_M/branches/stable

File:

• trunk/tools/livwww (modified) (2 diffs)

trunk/tools/livwww

@@ -12 +12 @@
 DESTUSER=apache
 MONDODIR=/mondo/www/html/mondo
+TESTDIR=/mondo/www/html/test
 
 
@@ -29 +30 @@
 find $DESTDIR -type d | xargs chmod 755
 find $DESTDIR -type f | xargs chmod 644
-if [ _"$1" == _"" ); then
+cd $DESTDIR
+if [ _"$1" == _"" ]; then
         exit 0
+else
+    if [ _"$1" == _"test" ]; then
+        DESTDIR=$TESTDIR
+    else
+        DESTDIR=$MONDODIR
+    fi
 fi
-cd $DESTDIR
 tar cfj /tmp/mondo-www.tz2 .
-ssh ${DESTUSER}@${DESTMACH} "rm -rf ${MONDODIR} ; mkdir ${MONDODIR}"
+ssh ${DESTUSER}@${DESTMACH} "rm -rf ${DESTDIR} ; mkdir ${DESTDIR}"
 scp /tmp/mondo-www.tz2 ${DESTUSER}@${DESTMACH}:/tmp
-ssh ${DESTUSER}@${DESTMACH} "cd ${MONDODIR} ; tar xfj /tmp/mondo-www.tz2"
+ssh ${DESTUSER}@${DESTMACH} "cd ${DESTDIR} ; tar xfj /tmp/mondo-www.tz2"