diff options
-rw-r--r-- | Make.rules | 2 | ||||
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | NEWS | 6 | ||||
-rw-r--r-- | README | 4 | ||||
-rw-r--r-- | backup.in | 2 | ||||
-rw-r--r-- | beam.in | 15 | ||||
-rwxr-xr-x | cleaner.in | 15 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | doc/Makefile.am | 2 | ||||
-rw-r--r-- | doc/beam-backup.1in | 4 | ||||
-rw-r--r-- | doc/beam-cleaner.1in | 4 | ||||
-rw-r--r-- | doc/beam-list.1in | 4 | ||||
-rw-r--r-- | doc/beam-module.5in | 4 | ||||
-rw-r--r-- | doc/beam-restore.1in | 4 | ||||
-rw-r--r-- | doc/beam-s3.1in | 4 | ||||
-rw-r--r-- | doc/beam.1in | 4 | ||||
-rw-r--r-- | lib/beam/Makefile.am | 2 | ||||
-rw-r--r-- | lib/beam/common.in | 2 | ||||
-rwxr-xr-x | lib/beam/fs.sh | 2 | ||||
-rwxr-xr-x | lib/beam/ldap.sh | 2 | ||||
-rwxr-xr-x | lib/beam/postgres.sh | 2 | ||||
-rw-r--r-- | lib/beam/s3.sh | 8 | ||||
-rw-r--r-- | list.in | 2 | ||||
-rw-r--r-- | restore.in | 0 | ||||
-rw-r--r-- | s3.in | 2 |
25 files changed, 66 insertions, 34 deletions
@@ -1,5 +1,5 @@ # This file is part of BEAM -# Copyright (C) 2012 Sergey Poznyakoff +# Copyright (C) 2012-2014 Sergey Poznyakoff # # BEAM is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/Makefile.am b/Makefile.am index c65a39d..551f7b2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # This file is part of BEAM -# Copyright (C) 2012 Sergey Poznyakoff +# Copyright (C) 2012-2014 Sergey Poznyakoff # # BEAM is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1,5 +1,5 @@ -BEAM NEWS -- history of user-visible changes. 2013-08-05 -Copyright (C) 2012, 2013 Sergey Poznyakoff. +BEAM NEWS -- history of user-visible changes. 2014-03-19 +Copyright (C) 2012-2014 Sergey Poznyakoff. See the end of file for copying conditions. Please send mailutils bug reports to <gray@gnu.org.ua>. @@ -44,7 +44,7 @@ First release. ---------------------------------------------------------------------- Copyright information: -Copyright (C) 2012, 2013 Sergey Poznyakoff. +Copyright (C) 2012-2014 Sergey Poznyakoff. Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the @@ -1,5 +1,5 @@ BEAM README file. -Copyright (C) 2012 Sergey Poznyakoff +Copyright (C) 2012-2014 Sergey Poznyakoff See the end of file for copying conditions. * Introduction @@ -112,7 +112,7 @@ Send bug reports to <gray@gnu.org.ua>. * Copyright information: -Copyright (C) 2012 Sergey Poznyakoff +Copyright (C) 2012-2014 Sergey Poznyakoff Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that @@ -1,6 +1,6 @@ #! /bin/sh # This file is part of BEAM -# Copyright (C) 2012 Sergey Poznyakoff +# Copyright (C) 2012-2014 Sergey Poznyakoff # # BEAM is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1,4 +1,19 @@ #! /bin/sh +# This file is part of BEAM +# Copyright (C) 2012-2014 Sergey Poznyakoff +# +# BEAM is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# BEAM is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with BEAM. If not, see <http://www.gnu.org/licenses/>. libdir=@LIBDIR@/beam set -e @@ -1,4 +1,19 @@ #! /bin/sh +# This file is part of BEAM +# Copyright (C) 2012-2014 Sergey Poznyakoff +# +# BEAM is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# BEAM is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with BEAM. If not, see <http://www.gnu.org/licenses/>. libdir=@LIBDIR@/beam set -e diff --git a/configure.ac b/configure.ac index a90c938..6e39a4a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # This file is part of BEAM -*- autoconf -*- -# Copyright (C) 2012, 2013 Sergey Poznyakoff +# Copyright (C) 2012-2014 Sergey Poznyakoff # # BEAM is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/doc/Makefile.am b/doc/Makefile.am index 846c1de..0d82900 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,5 +1,5 @@ # This file is part of BEAM -# Copyright (C) 2012 Sergey Poznyakoff +# Copyright (C) 2012-2014 Sergey Poznyakoff # # BEAM is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/doc/beam-backup.1in b/doc/beam-backup.1in index be45a44..2438d7b 100644 --- a/doc/beam-backup.1in +++ b/doc/beam-backup.1in @@ -1,5 +1,5 @@ .\" This file is part of BEAM -*- nroff -*- -.\" Copyright (C) 2012 Sergey Poznyakoff +.\" Copyright (C) 2012-2014 Sergey Poznyakoff .\" .\" BEAM is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by @@ -14,7 +14,7 @@ .\" You should have received a copy of the GNU General Public License .\" along with BEAM. If not, see <http://www.gnu.org/licenses/>. .\" -.TH BEAM\-BACKUP 1 "October 24, 2012" "BEAM" "BEAM User Reference" +.TH BEAM\-BACKUP 1 "March 19, 2014" "BEAM" "BEAM User Reference" .SH NAME beam\-backup \- create a back up. .SH SYNOPSIS diff --git a/doc/beam-cleaner.1in b/doc/beam-cleaner.1in index 36f2de7..59a39b4 100644 --- a/doc/beam-cleaner.1in +++ b/doc/beam-cleaner.1in @@ -1,5 +1,5 @@ .\" This file is part of BEAM -*- nroff -*- -.\" Copyright (C) 2012 Sergey Poznyakoff +.\" Copyright (C) 2012-2014 Sergey Poznyakoff .\" .\" BEAM is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by @@ -14,7 +14,7 @@ .\" You should have received a copy of the GNU General Public License .\" along with BEAM. If not, see <http://www.gnu.org/licenses/>. .\" -.TH BEAM\-CLEANER 1 "October 24, 2012" "BEAM" "BEAM User Reference" +.TH BEAM\-CLEANER 1 "March 19, 2014" "BEAM" "BEAM User Reference" .SH NAME beam\-cleaner \- clean up old backup files. .SH SYNOPSIS diff --git a/doc/beam-list.1in b/doc/beam-list.1in index 0614e81..57aa537 100644 --- a/doc/beam-list.1in +++ b/doc/beam-list.1in @@ -1,5 +1,5 @@ .\" This file is part of BEAM -*- nroff -*- -.\" Copyright (C) 2012 Sergey Poznyakoff +.\" Copyright (C) 2012-2014 Sergey Poznyakoff .\" .\" BEAM is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by @@ -14,7 +14,7 @@ .\" You should have received a copy of the GNU General Public License .\" along with BEAM. If not, see <http://www.gnu.org/licenses/>. .\" -.TH BEAM\-LIST 1 "October 24, 2012" "BEAM" "BEAM User Reference" +.TH BEAM\-LIST 1 "March 19, 2014" "BEAM" "BEAM User Reference" .SH NAME beam\-list \- list items included in backup .SH SYNOPSIS diff --git a/doc/beam-module.5in b/doc/beam-module.5in index f650c65..9ba239f 100644 --- a/doc/beam-module.5in +++ b/doc/beam-module.5in @@ -1,5 +1,5 @@ .\" This file is part of BEAM -*- nroff -*- -.\" Copyright (C) 2012 Sergey Poznyakoff +.\" Copyright (C) 2012-2014 Sergey Poznyakoff .\" .\" BEAM is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by @@ -14,7 +14,7 @@ .\" You should have received a copy of the GNU General Public License .\" along with BEAM. If not, see <http://www.gnu.org/licenses/>. .\" -.TH BEAM\-MODULE 5 "January 16, 2013" "BEAM" "BEAM Programmer Reference" +.TH BEAM\-MODULE 5 "March 19, 2014" "BEAM" "BEAM Programmer Reference" .SH NAME beam\-module \- format of .BR beam (1) diff --git a/doc/beam-restore.1in b/doc/beam-restore.1in index bbbfbba..6d24ad8 100644 --- a/doc/beam-restore.1in +++ b/doc/beam-restore.1in @@ -1,5 +1,5 @@ .\" This file is part of BEAM -*- nroff -*- -.\" Copyright (C) 2012 Sergey Poznyakoff +.\" Copyright (C) 2012-2014 Sergey Poznyakoff .\" .\" BEAM is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by @@ -14,7 +14,7 @@ .\" You should have received a copy of the GNU General Public License .\" along with BEAM. If not, see <http://www.gnu.org/licenses/>. .\" -.TH BEAM\-RESTORE 1 "October 24, 2012" "BEAM" "BEAM User Reference" +.TH BEAM\-RESTORE 1 "March 19, 2014" "BEAM" "BEAM User Reference" .SH NAME beam\-restore \- restore file system from a backup. .SH SYNOPSIS diff --git a/doc/beam-s3.1in b/doc/beam-s3.1in index 68dc66b..a295270 100644 --- a/doc/beam-s3.1in +++ b/doc/beam-s3.1in @@ -1,5 +1,5 @@ .\" This file is part of BEAM -*- nroff -*- -.\" Copyright (C) 2012 Sergey Poznyakoff +.\" Copyright (C) 2012-2014 Sergey Poznyakoff .\" .\" BEAM is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by @@ -14,7 +14,7 @@ .\" You should have received a copy of the GNU General Public License .\" along with BEAM. If not, see <http://www.gnu.org/licenses/>. .\" -.TH BEAM\-S3 1 "October 24, 2012" "BBE" "BBE User Reference" +.TH BEAM\-S3 1 "March 19, 2014" "BBE" "BBE User Reference" .SH NAME beam\-s3 \- manage a backup s3 bucket .SH SYNOPSIS diff --git a/doc/beam.1in b/doc/beam.1in index fc15064..0fd3ce5 100644 --- a/doc/beam.1in +++ b/doc/beam.1in @@ -1,5 +1,5 @@ .\" This file is part of BEAM -*- nroff -*- -.\" Copyright (C) 2012 Sergey Poznyakoff +.\" Copyright (C) 2012-2014 Sergey Poznyakoff .\" .\" BEAM is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by @@ -14,7 +14,7 @@ .\" You should have received a copy of the GNU General Public License .\" along with BEAM. If not, see <http://www.gnu.org/licenses/>. .\" -.TH BEAM 1 "October 24, 2012" "BEAM" "BEAM User Reference" +.TH BEAM 1 "March 19, 2014" "BEAM" "BEAM User Reference" .SH NAME beam \- a backup manager .SH SYNOPSIS diff --git a/lib/beam/Makefile.am b/lib/beam/Makefile.am index 22c9a12..81385ad 100644 --- a/lib/beam/Makefile.am +++ b/lib/beam/Makefile.am @@ -1,5 +1,5 @@ # This file is part of BEAM -# Copyright (C) 2012 Sergey Poznyakoff +# Copyright (C) 2012-2014 Sergey Poznyakoff # # BEAM is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/beam/common.in b/lib/beam/common.in index 4f2184b..94b4565 100644 --- a/lib/beam/common.in +++ b/lib/beam/common.in @@ -174,7 +174,7 @@ EOF } wtf() { - l=`echo "${1#beam-}"|sed "s|.|.|g"` + l=$(echo "${1#beam-}"|sed "s|.|.|g") s=$(echo " " | sed "s|$l|${1#beam-}|") shift echo " $s $@" diff --git a/lib/beam/fs.sh b/lib/beam/fs.sh index b4d0c2d..015082b 100755 --- a/lib/beam/fs.sh +++ b/lib/beam/fs.sh @@ -1,6 +1,6 @@ #! /bin/sh # This file is part of BEAM -# Copyright (C) 2012 Sergey Poznyakoff +# Copyright (C) 2012-2014 Sergey Poznyakoff # # BEAM is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/beam/ldap.sh b/lib/beam/ldap.sh index f6e56b8..40b9a4b 100755 --- a/lib/beam/ldap.sh +++ b/lib/beam/ldap.sh @@ -1,6 +1,6 @@ #! /bin/sh # This file is part of BEAM -# Copyright (C) 2012 Sergey Poznyakoff +# Copyright (C) 2012-2014 Sergey Poznyakoff # # BEAM is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/beam/postgres.sh b/lib/beam/postgres.sh index b5a9b6e..3938c1a 100755 --- a/lib/beam/postgres.sh +++ b/lib/beam/postgres.sh @@ -1,6 +1,6 @@ #! /bin/sh # This file is part of BEAM -# Copyright (C) 2012 Sergey Poznyakoff +# Copyright (C) 2012-2014 Sergey Poznyakoff # # BEAM is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/beam/s3.sh b/lib/beam/s3.sh index d2fcfe6..7b6ad91 100644 --- a/lib/beam/s3.sh +++ b/lib/beam/s3.sh @@ -1,6 +1,6 @@ #! /bin/sh # This file is part of BEAM -# Copyright (C) 2012 Sergey Poznyakoff +# Copyright (C) 2012-2014 Sergey Poznyakoff # # BEAM is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -40,7 +40,8 @@ s3_getmpoint() s=$(mount | grep "^${backup_mp_s3backer}/file" | awk '{ print $3 }') if [ -z "$s" ]; then # Some kernels print device name instead of the actual mount file: - s=$(mount | grep "^/dev/loop[0-9] on ${backup_mp_s3}" | awk '{ print $3 }') + s=$(mount | grep "^/dev/loop[0-9] on ${backup_mp_s3}" | + awk '{ print $3 }') fi echo $s;; *) @@ -77,7 +78,8 @@ s3_mount() { test -n "$backup_s3_mount_options" && mountopt="$mountopt,$backup_s3_mount_options" # NOTE: For ext4 add the journal_async_commit option. - $dry_run mount -oloop$mountopt $backup_mp_s3backer/file $backup_mp_s3 || + $dry_run mount -oloop$mountopt \ + $backup_mp_s3backer/file $backup_mp_s3 || abend 1 "unable to mount $backup_mp_s3backer/file" umount_list="$backup_mp_s3 $umount_list" else @@ -1,6 +1,6 @@ #! /bin/sh # This file is part of BEAM -# Copyright (C) 2012 Sergey Poznyakoff +# Copyright (C) 2012-2014 Sergey Poznyakoff # # BEAM is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1,6 +1,6 @@ #! /bin/sh # This file is part of BEAM -# Copyright (C) 2012 Sergey Poznyakoff +# Copyright (C) 2012-2014 Sergey Poznyakoff # # BEAM is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by |