diff options
| author | Matthijs Kooijman <matthijs@stdin.nl> | 2009-05-22 14:50:52 +0200 | 
|---|---|---|
| committer | Matthijs Kooijman <matthijs@stdin.nl> | 2009-05-23 10:34:16 +0200 | 
| commit | 4ecaae94054c4eb919ddbd45904d834383a09558 (patch) | |
| tree | dd27a8ee9dd7882f78b9cbf1b20ec51d9cf8285e /handlers/svn.in | |
| parent | 386c4275946520bc590428e730a9d515155436a0 (diff) | |
| download | backupninja-4ecaae94054c4eb919ddbd45904d834383a09558.tar.gz backupninja-4ecaae94054c4eb919ddbd45904d834383a09558.tar.bz2  | |
Make all indentation consistent.
Previously, there were many indentation styles in use: Real tabs, 2, 3
or 4 spaces, mixing these within the same file, function or even within
a single line.
This commit changes all bash scripts in the handlers, src and lib dirs
to use consistent indentation: three spaces are now used everywhere.
Other files (e.g. Makefiles) are left untouched.
Additionally, this commit removes all trailing whitespace.
Diffstat (limited to 'handlers/svn.in')
| -rw-r--r-- | handlers/svn.in | 64 | 
1 files changed, 32 insertions, 32 deletions
diff --git a/handlers/svn.in b/handlers/svn.in index d19b0b8..97d1701 100644 --- a/handlers/svn.in +++ b/handlers/svn.in @@ -7,7 +7,7 @@ getconf src /var/lib/svn  getconf dest /var/backups/svn  getconf tmp /var/backups/svn.tmp  getconf HOTBACKUP "/usr/bin/svnadmin hotcopy" -getconf vsname	 +getconf vsname  error=0 @@ -35,43 +35,43 @@ fi  cd $vroot$src  for repo in `find . -name svnserve.conf`  do -    repo=`dirname $repo` -    repo=`dirname $repo` +   repo=`dirname $repo` +   repo=`dirname $repo` -    ret=`mkdir -p $vroot$tmp/$repo 2>&1` -    code=$? -    if [ "$ret" ]; then -       debug "$ret" -    fi -    if [ $code != 0 ]; then    -       error "command failed mkdir -p $vroot$tmp/$repo" -    fi +   ret=`mkdir -p $vroot$tmp/$repo 2>&1` +   code=$? +   if [ "$ret" ]; then +      debug "$ret" +   fi +   if [ $code != 0 ]; then +      error "command failed mkdir -p $vroot$tmp/$repo" +   fi -    if [ $usevserver = yes ] -    then -	ret=`$VSERVER $vsname exec $HOTBACKUP $src/$repo $tmp/$repo 2>&1` -    else -	ret=`$HOTBACKUP $src/$repo $tmp/$repo 2>&1` -    fi -    code=$? -    if [ "$ret" ]; then -       debug "$ret" -    fi -    if [ $code != 0 ]; then -       error "command failed -- $HOTBACKUP $vroot$src/$repo $vroot$tmp/$repo" -       error=1 -    fi +   if [ $usevserver = yes ] +   then +      ret=`$VSERVER $vsname exec $HOTBACKUP $src/$repo $tmp/$repo 2>&1` +   else +      ret=`$HOTBACKUP $src/$repo $tmp/$repo 2>&1` +   fi +   code=$? +   if [ "$ret" ]; then +      debug "$ret" +   fi +   if [ $code != 0 ]; then +      error "command failed -- $HOTBACKUP $vroot$src/$repo $vroot$tmp/$repo" +      error=1 +   fi  done  if [ $error -eq 1 ]; then -    echo "Error: because of earlier errors, we are leaving svn backups in $vroot$tmp instead of $vroot$dest" +   echo "Error: because of earlier errors, we are leaving svn backups in $vroot$tmp instead of $vroot$dest"  else -    if [ -d $vroot$dest -a -d $vroot$tmp ]; then -        rm -rf $vroot$dest -    fi -    if [ -d $vroot$tmp ]; then -        mv $vroot$tmp $vroot$dest -    fi +   if [ -d $vroot$dest -a -d $vroot$tmp ]; then +      rm -rf $vroot$dest +   fi +   if [ -d $vroot$tmp ]; then +      mv $vroot$tmp $vroot$dest +   fi  fi  exit 0  | 
