Slight improvement

* backup.in (backup): Pass $backup_suffix to beam-cleaner,
instead of hardcoded value.
Optimize "main" block somewhat.
* NEWS, configure.ac: Version 1.3

3 files changed, 14 insertions, 13 deletions

diff --git a/NEWS b/NEWS
index 72933a8..90c72bd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,15 @@
-BEAM NEWS -- history of user-visible changes. 2012-06-01
+BEAM NEWS -- history of user-visible changes. 2012-06-21
 Copyright (C) 2012 Sergey Poznyakoff.
 See the end of file for copying conditions.
 
 Please send mailutils bug reports to <gray@gnu.org.ua>.
 
 
+Version 1.3
+
+Bugfixes.
+
+
 Version 1.2 (git)
 
 First release.
diff --git a/backup.in b/backup.in
index b791a72..98cf3e2 100644
--- a/backup.in
+++ b/backup.in
@@ -101,7 +101,7 @@ backup() {
   if test -n "$backup_retain_interval" &&
      test $backup_retain_interval -gt 0; then
     @LIBEXECDIR@/beam-cleaner --retain $backup_retain_interval $verbose \
-                ${dry_run+--dry-run} --suffix .tar.bz2 $backup_archive_dir
+                ${dry_run+--dry-run} --suffix $backup_suffix $backup_archive_dir
     @LIBEXECDIR@/beam-cleaner --retain $backup_retain_interval $verbose \
                 ${dry_run+--dry-run} --suffix .db $backup_snapshot_dir
   fi
@@ -121,11 +121,11 @@ backup() {
   logit "finished"
 }
 
+if [ -n "$backup_logfile" ]; then
+  exec >>$backup_logfile
+  exec 2>&1
+fi
 if [ -z "$backup_notify_email" ]; then
-  if [ -n "$backup_logfile" ]; then
-    exec >>$backup_logfile
-    exec 2>&1
-  fi
   backup
 else
   u=$(umask)
@@ -133,14 +133,10 @@ else
   report=$backup_snapshot_dir/report.$$
   touch $report
   umask $u
-  if [ -n "$backup_logfile" ]; then
-     ( exec 2>&1; backup ) | tee $report >> $backup_logfile
-  else
-     ( exec 2>&1; backup ) | tee $report
-  fi
+  backup 2>&1 | tee $report
   mail_report $report
   rm $report
-fi  
+fi
 
 
 # finis coronat opus
diff --git a/configure.ac b/configure.ac
index ee36499..5028c87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
 
 AC_PREREQ(2.63)
 
-AC_INIT(beam, 1.2, gray@gnu.org.ua)
+AC_INIT(beam, 1.3, gray@gnu.org.ua)
 AC_CONFIG_SRCDIR(backup.in)
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([1.11 tar-ustar silent-rules])