flyttet /tmp/.backup til ~/.backup

diff --git a/backup.sh b/backup.sh
index 20a26f955d658fade5912bd667983cb6b68e89eb..dd96e1299d9b2f2c2ca426de08f6fb0b96e18527 100755 (executable)
--- a/backup.sh
+++ b/backup.sh
@@ -68,10 +68,13 @@ backup()
    tar=tar
  fi
 
+ #expand the exclude-path for use with tar
+ exf=`ssh $computer "ls ~/.backup/exclude"`
+
  #We try to run tar on the remote computer
  if `ssh $computer "cd $filesystem ;\
      $tar cfl - . $lastcmd \
-      --exclude-from=/tmp/.backup/exclude \
+      --exclude-from=$exf \
         | gzip" \
    |  dd of=$DATE.tmp 2>/dev/null` 
  then
@@ -112,20 +115,20 @@ do
   | awk '{ if ( $(NF-1) != "0" ) print $2}' `
 
  #clean up our dir at this client
- ssh $computer "rm -rf /tmp/.backup ; mkdir -m 700 /tmp/.backup"
+ ssh $computer "rm -r ~/.backup ; mkdir -m 700 ~/.backup"
 
  #try to copy $exclude to $computer
- scp $exclude $computer:/tmp/.backup/exclude ||
+ scp $exclude $computer:~/.backup/exclude ||
     echo "could not copy exclude.txt to $computer :("
 
  #try to copy preeexec and postexec if they exist
  [ -f $confdir/preexec.$computer ] &&
-    scp $confdir/preexec.$computer  $computer:/tmp/.backup/preexec
+    scp $confdir/preexec.$computer  $computer:~/.backup/preexec
  [ -f $confdir/postexec.$computer ] &&
-    scp $confdir/postexec.$computer $computer:/tmp/.backup/postexec
+    scp $confdir/postexec.$computer $computer:~/.backup/postexec
 
  #try to run preexec if it exist
- ssh $computer "[ -f /tmp/.backup/preexec ] && /bin/bash -x /tmp/.backup/preexec"
+ ssh $computer "[ -f ~/.backup/preexec ] && /bin/bash -x ~/.backup/preexec"
 
  for filesystem in $filesystems
  do
@@ -184,13 +187,13 @@ do
  done
 
  #try to run postexec if it exist
- ssh $computer "[ -f /tmp/.backup/postexec ] && /bin/bash -x /tmp/.backup/postexec"
+ ssh $computer "[ -f ~/.backup/postexec ] && /bin/bash -x ~/.backup/postexec"
 
 done
 
 #create report
 /home/backup/report.sh $storagedir > /tmp/report.txt
-[ ! -z $remotestat ] && scp /tmp/report.txt $remotestat
+#[ ! -z $remotestat ] && scp /tmp/report.txt $remotestat
 ###
 
 date