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/wget | |
| 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/wget')
| -rw-r--r-- | handlers/wget | 120 | 
1 files changed, 59 insertions, 61 deletions
| diff --git a/handlers/wget b/handlers/wget index 51054ea..0c363eb 100644 --- a/handlers/wget +++ b/handlers/wget @@ -77,84 +77,82 @@ getconf folder  function rotate { -  if [[ "$2" < 4 ]]; then -    error "Rotate: minimum of 4 rotations" -    exit 1 -  fi - -  if [ -d $1.$2 ]; then -    $nice $mv /$1.$2 /$1.tmp -  fi - -  for ((n=`echo "$2 - 1" | bc`; n >= 0; n--)); do -    if [ -d $1.$n ]; then -      dest=`echo "$n + 1" | bc` -      $nice $mv /$1.$n /$1.$dest -      $touch /$1.$dest -    fi -  done - -  if [ -d $1.tmp ]; then -    $nice $mv /$1.tmp /$1.0 -  fi - -  if [ -d $1.1 ]; then -    $nice $cp -alf /$1.1/. /$1.0 -  fi +   if [[ "$2" < 4 ]]; then +      error "Rotate: minimum of 4 rotations" +      exit 1 +   fi -} +   if [ -d $1.$2 ]; then +      $nice $mv /$1.$2 /$1.tmp +   fi -function move_files { +   for ((n=`echo "$2 - 1" | bc`; n >= 0; n--)); do +      if [ -d $1.$n ]; then +         dest=`echo "$n + 1" | bc` +         $nice $mv /$1.$n /$1.$dest +         $touch /$1.$dest +      fi +   done - ref=$tmp/makesnapshot-mymv-$$; - $touch -r $1 $ref; - $mv $1 $2; - $touch -r $ref $2; - $rm $ref; +   if [ -d $1.tmp ]; then +      $nice $mv /$1.tmp /$1.0 +   fi + +   if [ -d $1.1 ]; then +      $nice $cp -alf /$1.1/. /$1.0 +   fi  } +function move_files { +   ref=$tmp/makesnapshot-mymv-$$; +   $touch -r $1 $ref; +   $mv $1 $2; +   $touch -r $ref $2; +   $rm $ref; +} +  backupdir="$mountpoint/$backupdir"  # does $backupdir exists? -if [ ! -d "$backupdir" ]; then  -  error "Backupdir $backupdir does not exist" -  exit 1 +if [ ! -d "$backupdir" ]; then +   error "Backupdir $backupdir does not exist" +   exit 1  fi  # setup number of increments  if [ -z "$days" ]; then -  keep="4" +   keep="4"  else -  keep="`echo $days - 1 | bc -l`" +   keep="`echo $days - 1 | bc -l`"  fi  # lockfile setup  if [ ! -z "$lockfile" ]; then -  $touch $lockfile || warning "Could not create lockfile $lockfile" +   $touch $lockfile || warning "Could not create lockfile $lockfile"  fi  # nicelevel setup -if [ ! -z "$nicelevel" ]; then  -  nice="nice -n $nicelevel" -else  -  nice="" +if [ ! -z "$nicelevel" ]; then +   nice="nice -n $nicelevel" +else +   nice=""  fi  # set mv procedure  if [ $enable_mv_timestamp_bug == "yes" ]; then -  mv=move_files +   mv=move_files  fi  # set excludes  for path in $exclude; do -  EXCLUDES="$EXCLUDES --exclude=$path" +   EXCLUDES="$EXCLUDES --exclude=$path"  done  echo "Starting backup at `date`" >> $log @@ -162,19 +160,19 @@ echo "Starting backup at `date`" >> $log  # mount backup destination folder as read-write  if [ "$read_only" == "1" ] || [ "$read_only" == "yes" ]; then -  if [ -d "$mountpoint" ]; then -    mount -o remount,rw $mountpoint -    if (($?)); then -      error "Could not mount $mountpoint" -      exit 1 -    fi -  fi +   if [ -d "$mountpoint" ]; then +      mount -o remount,rw $mountpoint +      if (($?)); then +         error "Could not mount $mountpoint" +         exit 1 +      fi +   fi  fi  # the backup procedure  if [ ! -d "$backupdir/$folder/$folder.0" ]; then -  mkdir -p $backupdir/$folder/$folder.0 +   mkdir -p $backupdir/$folder/$folder.0  fi  info "Rotating $backupdir/$folder/$folder..." @@ -183,7 +181,7 @@ rotate $backupdir/$folder/$folder $keep  info "Wget'ing $SECTION on $backupdir/$folder/$folder.0..."  if [ ! -z "$badnwidth" ]; then -  limit_rate="--limit-rate=$badnwidth""k" +   limit_rate="--limit-rate=$badnwidth""k"  fi  cd $backupdir/$folder/$folder.0 @@ -195,25 +193,25 @@ $touch $backupdir/$folder/$folder.0  # remount backup destination as read-only  if [ "$read_only" == "1" ] || [ "$read_only" == "yes" ]; then -  mount -o remount,ro $mountpoint +   mount -o remount,ro $mountpoint  fi  # check partition for errors  if [ "$fscheck" == "1" ] || [ "$fscheck" == "yes" ]; then -  umount $mountpoint -  if (($?)); then -    warning "Could not umount $mountpoint to run fsck" -  else -    $nice $fsck -v -y $partition >> $log -    mount $mountpoint -  fi +   umount $mountpoint +   if (($?)); then +      warning "Could not umount $mountpoint to run fsck" +   else +      $nice $fsck -v -y $partition >> $log +      mount $mountpoint +   fi  fi  # removes the lockfile  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 | 
