backupninja update

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@9 370017ae-e619-0410-ac65-c121f96126d4

2 files changed, 15 insertions, 12 deletions

diff --git a/backupninja/backupninja.SlackBuild b/backupninja/backupninja.SlackBuild
index 0281579f..b4cf5fdd 100755
--- a/backupninja/backupninja.SlackBuild
+++ b/backupninja/backupninja.SlackBuild
@@ -17,7 +17,7 @@ fi
 PACKAGE="backupninja"
 ARCH="noarch"
 VERSION=${VERSION:=0.9.3}
-BUILD=${BUILD:=12rha}
+BUILD=${BUILD:=13rha}
 SRC_DIR=${SRC:=$CWD}
 TMP=${TMP:=/tmp}
 REPOS=${REPOS:=$TMP}
diff --git a/backupninja/rub b/backupninja/rub
index 7453e832..20ec5f2c 100755
--- a/backupninja/rub
+++ b/backupninja/rub
@@ -70,8 +70,8 @@ done
 
 if [ ! -z "$service" ]; then
   for daemon in $service; do
-    info "Stopping service $service..."
-    $initscripts/$service stop
+    info "Stopping service $daemon..."
+    $initscripts/$daemon stop
   done
 fi
 
@@ -120,15 +120,18 @@ fi
 
 for SECTION in $include; do
 
- if [ ! -d "$backupdir/$SECTION/$SECTION.0" ]; then
-   mkdir -p $backupdir/$SECTION/$SECTION.0
+ section="`basename $SECTION`"
+
+ if [ ! -d "$backupdir/$SECTION/$section.0" ]; then
+   mkdir -p $backupdir/$SECTION/$section.0
  fi
  
  info "Rotating $backupdir/$SECTION/$SECTION..."
- rotate $backupdir/$SECTION/$SECTION $keep
- info "Syncing $SECTION on $backupdir/$SECTION/$SECTION.0..."
- rsync -av --delete $EXCLUDES /$SECTION/ $backupdir/$SECTION/$SECTION.0/ >> $log
- touch $backupdir/$SECTION/$SECTION.0
+ echo "Rotating $backupdir/$SECTION/$SECTION..." >> $log
+ rotate $backupdir/$SECTION/$section $keep
+ info "Syncing $SECTION on $backupdir/$SECTION/$section.0..."
+ rsync -av --delete $EXCLUDES /$SECTION/ $backupdir/$SECTION/$section.0/ >> $log
+ touch $backupdir/$SECTION/$section.0
 
 done
 
@@ -148,13 +151,13 @@ fi
 
 if [ ! -z "$service" ]; then
   for daemon in $service; do
-    info "Starting service $service..."
-    $initscripts/$service start
+    info "Starting service $daemon..."
+    $initscripts/$daemo start
   done
 fi
 
 if [ ! -z "$lockfile" ]; then
-  rm lockfile || warning "Could not remove lockfile $lockfile"
+  rm $lockfile || warning "Could not remove lockfile $lockfile"
 fi
 
 echo "Finnishing backup at `date`" >> $log