diff options
| author | Patrick J Cherry <patrick@bytemark.co.uk> | 2016-11-09 09:41:50 +0000 |
|---|---|---|
| committer | Patrick J Cherry <patrick@bytemark.co.uk> | 2016-11-09 09:41:50 +0000 |
| commit | 3cc8a83938cd4eae9a196375dca2fd9127f23aa0 (patch) | |
| tree | fa36b507469bdb1c7b4891e336a6928c59bceab5 /bin | |
| parent | 25f3947c16b57a9686500534e44423aab90b0bc7 (diff) | |
| parent | c68fe975ab4b47436bd90fa701b83a78793b0f32 (diff) | |
Merge branch 'master' into 12-fix-btrfs-path
Diffstat (limited to 'bin')
| -rw-r--r--[-rwxr-xr-x] | bin/byteback-backup | 13 | ||||
| -rwxr-xr-x | bin/byteback-receive | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/bin/byteback-backup b/bin/byteback-backup index 0a50909..8268353 100755..100644 --- a/bin/byteback-backup +++ b/bin/byteback-backup @@ -230,11 +230,12 @@ if __FILE__ == $PROGRAM_NAME COMMON_JUNK = %w( /swap.file - /tmp - /var/backups/localhost - /var/cache/apt/archives - /var/lib/php5 - /var/tmp + /tmp/ + /var/backups/localhost/ + /var/cache/apt/archives/ + /var/lib/php5/ + /var/tmp/ + /var/lib/mysql/ ) MOUNT_HEADINGS = %w( spec file vfstype mntops freq passno ).map(&:to_sym) @@ -253,7 +254,7 @@ if __FILE__ == $PROGRAM_NAME e.gsub(/\/+/, '/') end - fatal('Must suply --destination or put it into /etc/bytebackup/destination') unless @destination + fatal('Must supply --destination or put it into /etc/bytebackup/destination') unless @destination # # Test that we have an SSH-key which we can read. diff --git a/bin/byteback-receive b/bin/byteback-receive index 0d7d025..1326bba 100755 --- a/bin/byteback-receive +++ b/bin/byteback-receive @@ -116,7 +116,7 @@ end # Make sure we don't get crazy option combinations. # n_modes = opts.keys.inject(0) do |s,m| - s += 1 if [:ping, :complete, :list].include?(m) + [:ping, :complete, :list].include?(m) ? s += 1 : s end error('Please only choose one mode') unless n_modes == 1 |