Install the programs and files using a more sane prefix.

* Makefile (BINDIR): Changed to /opt/LYSrdiff.
* backup-all: Changed prefix to /opt/LYSrdiff.
* backup-one-task: Ditto.
* backup-repeatedly: Ditto.
* distribute-tasks: Ditto.
* fetch-backup-work: Ditto.
* lysrdiff-move-job: Ditto.

ChangeLog

+2007-04-03  Per Cederqvist  <ceder@shafan.lysator.liu.se>
+
+	Install the programs and files using a more sane prefix.
+	* Makefile (BINDIR): Changed to /opt/LYSrdiff.
+	* backup-all: Changed prefix to /opt/LYSrdiff.
+	* backup-one-task: Ditto.
+	* backup-repeatedly: Ditto.
+	* distribute-tasks: Ditto.
+	* fetch-backup-work: Ditto.
+	* lysrdiff-move-job: Ditto.
+
 2007-04-03  Per Cederqvist  <ceder@sedesopim.lysator.liu.se>
 
 	LYSrdiff partitions are now named after both the disk and the

Makefile

-BINDIR=/nobackup/backup.lysator/bin
+BINDIR=/opt/LYSrdiff/bin
 
 all:;
 

backup-all

@@ -66,7 +66,7 @@ do
   fi
 done
 
-/nobackup/backup.lysator/bin/distribute-tasks $PARTS
+/opt/LYSrdiff/bin/distribute-tasks $PARTS
 
 total=0
 for lysrdiffpart in $PARTS
@@ -84,23 +84,23 @@ do
   while read category subcategory server serverpath
   do
 
-    if [ -f /nobackup/backup.lysator/etc/stop ]
+    if [ -f /opt/LYSrdiff/etc/stop ]
     then
 	echo Stop file found.  Exiting at $ctr/$total. >&2
 	exit 1
     fi
 
-    if [ -f /nobackup/backup.lysator/etc/hold ]
+    if [ -f /opt/LYSrdiff/etc/hold ]
     then
 	echo Hold file found.  Holding at $ctr/$total... >&2
-	while [ -f /nobackup/backup.lysator/etc/hold ]
+	while [ -f /opt/LYSrdiff/etc/hold ]
 	do
 	  sleep 1
 	done
 	echo Hold file disappeared.  Continuing. >&2
     fi
 
-    /nobackup/backup.lysator/bin/backup-one-task \
+    /opt/LYSrdiff/bin/backup-one-task \
       $failed $retry $new $only_prune \
       $disk $part "$category" "$subcategory" "$server" "$serverpath" \
       "$ctr/$total $disk/$part $category $subcategory"

backup-one-task

@@ -17,7 +17,7 @@ retry=0
 new=0
 only_prune=0
 
-ss=/nobackup/backup.lysator/bin/lysrdiff-set-status.py
+ss=/opt/LYSrdiff/bin/lysrdiff-set-status.py
 
 while [ $# -gt 1 ]
 do

backup-repeatedly

@@ -3,33 +3,33 @@ ctr=0
 while :
 do
   ctr=`expr $ctr + 1`
-  [ -f /nobackup/backup.lysator/etc/finish ] && break
-  [ -f /nobackup/backup.lysator/etc/stop ] && break
+  [ -f /opt/LYSrdiff/etc/finish ] && break
+  [ -f /opt/LYSrdiff/etc/stop ] && break
 
   echo
   echo Running all jobs.  Repeat count: $ctr.
   echo
-  /nobackup/backup.lysator/bin/backup-all $@
+  /opt/LYSrdiff/bin/backup-all $@
 
-  [ -f /nobackup/backup.lysator/etc/finish ] && break
-  [ -f /nobackup/backup.lysator/etc/stop ] && break
+  [ -f /opt/LYSrdiff/etc/finish ] && break
+  [ -f /opt/LYSrdiff/etc/stop ] && break
 
   echo
   echo Retrying failed jobs.  Repeat count: $ctr.
   echo
-  /nobackup/backup.lysator/bin/backup-all --failed $@
+  /opt/LYSrdiff/bin/backup-all --failed $@
 
-  [ -f /nobackup/backup.lysator/etc/finish ] && break
-  [ -f /nobackup/backup.lysator/etc/stop ] && break
+  [ -f /opt/LYSrdiff/etc/finish ] && break
+  [ -f /opt/LYSrdiff/etc/stop ] && break
 
   echo
   echo Retrying jobs with warnings.  Repeat count: $ctr.
   echo
   # This takes too much time...
-  # /nobackup/backup.lysator/bin/backup-all --retry $@
+  # /opt/LYSrdiff/bin/backup-all --retry $@
 
-  [ -f /nobackup/backup.lysator/etc/finish ] && break
-  [ -f /nobackup/backup.lysator/etc/stop ] && break
+  [ -f /opt/LYSrdiff/etc/finish ] && break
+  [ -f /opt/LYSrdiff/etc/stop ] && break
 
   echo
   echo Sleeping one minute.  Repeat count: $ctr.

distribute-tasks

@@ -62,7 +62,7 @@ class JobInfo(object):
             self.host(), self.directory())
 
 def newtasks():
-    where = open("/nobackup/backup.lysator/var/newtasks").read()
+    where = open("/opt/LYSrdiff/var/newtasks").read()
     disk, part = where.split("/")
     return (int(disk), int(part))
 
@@ -109,7 +109,7 @@ def read_new_tasks():
 
     new_found = False
     new_tasks = []
-    for line in file("/nobackup/backup.lysator/var/tasks"):
+    for line in file("/opt/LYSrdiff/var/tasks"):
         info = parse_line(line)
         if info.source() not in tasks_per_source:
             for other in tasks_per_destination.get(info.destination(), []):

fetch-backup-work

 #!/bin/sh
 
-TASKS=/nobackup/backup.lysator/var/tasks
+TASKS=/opt/LYSrdiff/var/tasks
 NT=$TASKS.tmp
 
 rm -f $NT

lysrdiff-move-job

@@ -57,7 +57,7 @@ done
 rm $MOVEDTASK
 
 echo "Moving $category $subcategory"
-ss=/nobackup/backup.lysator/bin/lysrdiff-set-status.py
+ss=/opt/LYSrdiff/bin/lysrdiff-set-status.py
 $ss $srcdisk $srcpart "Moving $category $subcategory to $dstdisk $dstpart"
 $ss $dstdisk $dstpart "Moving $category $subcategory from $srcdisk $srcpart"