minor mktemp incompatibility fixed.

This commit is contained in:
tomas 2005-06-16 09:27:19 +00:00
parent 756d368463
commit e67029aa32
2 changed files with 9 additions and 6 deletions

View file

@ -22,7 +22,7 @@
# #
# #
# Author : $Author: tomas $ # Author : $Author: tomas $
# Version : $Revision: 1.1 $ # Version : $Revision: 1.2 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageAdmin/bin/backup.sh,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageAdmin/bin/backup.sh,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -92,7 +92,7 @@ destdir=`cd $destdir; pwd`
# Do backup # Do backup
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
tmpdir=`mktemp -dp $tmpmaindir` tmpdir=`mktemp -d $tmpmaindir/tmp.XXXXXX`
echo "Backuping to $destdir/$tarfile :" echo "Backuping to $destdir/$tarfile :"
echo "Dumping database ..." echo "Dumping database ..."
@ -110,7 +110,7 @@ echo "Compressing XML part ..."
bzip2 $tarfile0 bzip2 $tarfile0
tar rf $tarfile $tarfile0.bz2 --remove-files tar rf $tarfile $tarfile0.bz2 --remove-files
mv $tarfile "$destdir" mv $tarfile "$destdir"
rm -rf $tmpdir rmdir $tmpdir
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Say goodbye # Say goodbye

View file

@ -22,7 +22,7 @@
# #
# #
# Author : $Author: tomas $ # Author : $Author: tomas $
# Version : $Revision: 1.1 $ # Version : $Revision: 1.2 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageAdmin/bin/restore.sh,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageAdmin/bin/restore.sh,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -98,7 +98,7 @@ tarfile="$tfdir/$tfbname"
# Do restore # Do restore
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
tmpdir=`mktemp -dp $tmpmaindir` tmpdir=`mktemp -d $tmpmaindir/tmp.XXXXXX`
echo "Restoring database from $tarfile ..." echo "Restoring database from $tarfile ..."
cd $tmpdir cd $tmpdir
@ -107,7 +107,10 @@ tar xjf $tarfile0.bz2
rm -f $tarfile0.bz2 rm -f $tarfile0.bz2
cd $phpdir cd $phpdir
php -q restore.php $tmpdir/$dbxml $tmpdir php -q restore.php $tmpdir/$dbxml $tmpdir
rm -rf $tmpdir rm -rf "$tmpdir/stor"
rm -f $tmpdir/*
rmdir "$tmpdir"
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Say goodbye # Say goodbye