[rear-devel] [rear/rear] 0dc508: Add support for options --keep-within and --keep-l...

Vladimir Gozora noreply at github.com
Sun May 10 19:21:43 CEST 2020


  Branch: refs/heads/master
  Home:   https://github.com/rear/rear
  Commit: 0dc5085745b118d35cc277641bd0aad3445acd75
      https://github.com/rear/rear/commit/0dc5085745b118d35cc277641bd0aad3445acd75
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-04-29 (Wed, 29 Apr 2020)

  Changed paths:
    M usr/share/rear/lib/borg-functions.sh

  Log Message:
  -----------
  Add support for options --keep-within and --keep-last for Borg archive pruning.


  Commit: 5d853fd51d80ea941c2732d78b69426fcc3555b3
      https://github.com/rear/rear/commit/5d853fd51d80ea941c2732d78b69426fcc3555b3
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-04-29 (Wed, 29 Apr 2020)

  Changed paths:
    M usr/share/rear/backup/BORG/default/500_make_backup.sh

  Log Message:
  -----------
  Add some options to borg_additional_options for borg create.


  Commit: dd2994fdc98dd0c23d7178473b2f3c35b72e4486
      https://github.com/rear/rear/commit/dd2994fdc98dd0c23d7178473b2f3c35b72e4486
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-04-29 (Wed, 29 Apr 2020)

  Changed paths:
    M usr/share/rear/backup/BORG/default/800_prune_old_backups.sh

  Log Message:
  -----------
  Add some options to borg_additional_options for borg prune.


  Commit: 4775f3f7ea9cf75f16a1341aea5e406a4fb8b72c
      https://github.com/rear/rear/commit/4775f3f7ea9cf75f16a1341aea5e406a4fb8b72c
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-04-29 (Wed, 29 Apr 2020)

  Changed paths:
    M usr/share/rear/prep/BORG/default/300_init_archive.sh

  Log Message:
  -----------
  Add option to borg_additional_options for borg init.


  Commit: a23b9d2e6218d698ef290353237a89a5db58e22f
      https://github.com/rear/rear/commit/a23b9d2e6218d698ef290353237a89a5db58e22f
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-04-29 (Wed, 29 Apr 2020)

  Changed paths:
    M usr/share/rear/restore/BORG/default/400_restore_backup.sh

  Log Message:
  -----------
  Add some options to borg_additional_options for borg extract.


  Commit: 1716887b4fb79eeeb8b41cffa97e47c1262cc88c
      https://github.com/rear/rear/commit/1716887b4fb79eeeb8b41cffa97e47c1262cc88c
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-04-29 (Wed, 29 Apr 2020)

  Changed paths:
    M usr/share/rear/lib/borg-functions.sh

  Log Message:
  -----------
  Save stderr output of borg list to tmp file.

Will be used checking the reason in case borg list fails,
e.g. in `usr/share/rear/prep/BORG/default/300_init_archive.sh`.


  Commit: 7985c585ad848e7353f171c51f446b91516937ef
      https://github.com/rear/rear/commit/7985c585ad848e7353f171c51f446b91516937ef
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-04-29 (Wed, 29 Apr 2020)

  Changed paths:
    M usr/share/rear/prep/BORG/default/300_init_archive.sh

  Log Message:
  -----------
  Improve error handling in prep/BORG/default/300_init_archive.sh.


  Commit: 230c5154457d1f85a40dd97407e9b583b8011b88
      https://github.com/rear/rear/commit/230c5154457d1f85a40dd97407e9b583b8011b88
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-04-29 (Wed, 29 Apr 2020)

  Changed paths:
    M usr/share/rear/restore/BORG/default/300_load_archives.sh

  Log Message:
  -----------
  Fix usage of BORGBACKUP_HOST.

If BORGBACKUP_HOST is not set, backup will be to USB.


  Commit: 65e3402cfdbdf80870429864f3cf7a4c775441ce
      https://github.com/rear/rear/commit/65e3402cfdbdf80870429864f3cf7a4c775441ce
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-04-29 (Wed, 29 Apr 2020)

  Changed paths:
    M usr/share/rear/backup/BORG/default/500_make_backup.sh
    M usr/share/rear/lib/borg-functions.sh

  Log Message:
  -----------
  Introduce function borg_create and use it.

Depending, if `--progress` is used with `borg create`, log to rear log
file or not, that is redirecting stderr.


  Commit: a2d34e17076f721f49e71b578dc42f9fcaaa9611
      https://github.com/rear/rear/commit/a2d34e17076f721f49e71b578dc42f9fcaaa9611
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-04-29 (Wed, 29 Apr 2020)

  Changed paths:
    M usr/share/rear/backup/BORG/default/800_prune_old_backups.sh

  Log Message:
  -----------
  Consolidate prune vs purge naming and usage of BORGBACKUP_HOST.

- Borg is talking about pruning, so just replace purge with prune in
  comments and logs.
- If BORGBACKUP_HOST is not set, we backup to USB.


  Commit: 1d63a45efd48b87bfe473794e06f41f70df89291
      https://github.com/rear/rear/commit/1d63a45efd48b87bfe473794e06f41f70df89291
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-04-30 (Thu, 30 Apr 2020)

  Changed paths:
    M usr/share/rear/lib/borg-functions.sh
    M usr/share/rear/restore/BORG/default/400_restore_backup.sh

  Log Message:
  -----------
  Introduce function borg_extract and use it.

Depending, if `--progress` is used with `borg restore`, log to rear log
file or not, that is redirecting stderr.


  Commit: 53d876d054d0e8eb6bd8c1af81c620d1418ced1a
      https://github.com/rear/rear/commit/53d876d054d0e8eb6bd8c1af81c620d1418ced1a
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-04-30 (Thu, 30 Apr 2020)

  Changed paths:
    M usr/share/rear/backup/BORG/default/800_prune_old_backups.sh
    M usr/share/rear/lib/borg-functions.sh

  Log Message:
  -----------
  Introduce function borg_prune and use it.

Depending on BORGBACKUP_SHOW_PROGRESS and VERBOSE variables
3 cases are there for `borg prune` to log to rear log file or not.

1. BORGBACKUP_SHOW_PROGRESS true:
   No change, same behaviour as before.
   No logging to rear log file.

2. VERBOSE true:
   stderr (2) is copied to real stderr (8)
   2 is going to rear logfile
   8 is shown becausee of VERBOSE true

3. Third case:
   stderr (2) is untouched, hence only going to rear logfile


  Commit: 0838cd8c9b30a4a2473de4d4f8b74565c8a553f8
      https://github.com/rear/rear/commit/0838cd8c9b30a4a2473de4d4f8b74565c8a553f8
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-04-30 (Thu, 30 Apr 2020)

  Changed paths:
    M usr/share/rear/backup/BORG/default/500_make_backup.sh

  Log Message:
  -----------
  Redirect stderr of borg_create.

Similar to commit 53d876d054d0e8eb6bd8c1af81c620d1418ced1a (borg_prune).

Depending on BORGBACKUP_SHOW_PROGRESS and VERBOSE variables
3 cases are there for `borg prune` to log to rear log file or not.

1. BORGBACKUP_SHOW_PROGRESS true:
   No change, same behaviour as before.
   No logging to rear log file.

2. VERBOSE true:
   stderr (2) is copied to real stderr (8)
   2 is going to rear logfile
   8 is shown becausee of VERBOSE true

3. Third case:
   stderr (2) is untouched, hence only going to rear logfile


  Commit: e8b65fc2c3c4c12f2c19de44c36ba5bc56b0b300
      https://github.com/rear/rear/commit/e8b65fc2c3c4c12f2c19de44c36ba5bc56b0b300
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-04-30 (Thu, 30 Apr 2020)

  Changed paths:
    M usr/share/rear/verify/BORG/default/400_check_archive_access.sh

  Log Message:
  -----------
  No need to call borg_list again, BORGBACKUP_STDERR_FILE is still set.

Internally borg_archive_cache_create calls borg_list.
And borg_list sets BORGBACKUP_STDERR_FILE.


  Commit: 0c6ad651e0bc34ee0ea015060a22af6e78fd9fad
      https://github.com/rear/rear/commit/0c6ad651e0bc34ee0ea015060a22af6e78fd9fad
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-04-30 (Thu, 30 Apr 2020)

  Changed paths:
    M usr/share/rear/restore/BORG/default/400_restore_backup.sh

  Log Message:
  -----------
  Fix small typo in comment.


  Commit: 70b2d34f462ea91d7ea993f0cfd4178f34bbee0b
      https://github.com/rear/rear/commit/70b2d34f462ea91d7ea993f0cfd4178f34bbee0b
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-04-30 (Thu, 30 Apr 2020)

  Changed paths:
    M usr/share/rear/prep/BORG/default/300_init_archive.sh

  Log Message:
  -----------
  Add LogPrint statement after successful creation of Borg repository.


  Commit: d298389aef0e8bfa866b78aba6adf1674293a5e2
      https://github.com/rear/rear/commit/d298389aef0e8bfa866b78aba6adf1674293a5e2
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-04-30 (Thu, 30 Apr 2020)

  Changed paths:
    M usr/share/rear/backup/BORG/default/500_make_backup.sh
    M usr/share/rear/backup/BORG/default/800_prune_old_backups.sh
    M usr/share/rear/restore/BORG/default/400_restore_backup.sh

  Log Message:
  -----------
  Explain more about redirection of stderr output of Borg.


  Commit: 3e57bb232cc65b3a9fbc917079f5296c1177d0ac
      https://github.com/rear/rear/commit/3e57bb232cc65b3a9fbc917079f5296c1177d0ac
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-01 (Fri, 01 May 2020)

  Changed paths:
    M usr/share/rear/lib/borg-functions.sh

  Log Message:
  -----------
  Add list missing --keep-* option for borg prune.


  Commit: 3e659626e01f4672513d99e6d5c61d46510effa4
      https://github.com/rear/rear/commit/3e659626e01f4672513d99e6d5c61d46510effa4
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-01 (Fri, 01 May 2020)

  Changed paths:
    M usr/share/rear/conf/default.conf

  Log Message:
  -----------
  Describe new options for Borg integration in conf/default.conf.


  Commit: 706addcf702bc8ae4b2f7e35487f87a5845c3189
      https://github.com/rear/rear/commit/706addcf702bc8ae4b2f7e35487f87a5845c3189
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-01 (Fri, 01 May 2020)

  Changed paths:
    M usr/share/rear/backup/BORG/default/500_make_backup.sh
    M usr/share/rear/backup/BORG/default/800_prune_old_backups.sh
    M usr/share/rear/conf/default.conf
    M usr/share/rear/restore/BORG/default/400_restore_backup.sh

  Log Message:
  -----------
  Make BORGBACKUP_SHOW_* configurable for create, prune and extract.


  Commit: 48d3209762f290220573eeea96225c1b64d28a0d
      https://github.com/rear/rear/commit/48d3209762f290220573eeea96225c1b64d28a0d
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-01 (Fri, 01 May 2020)

  Changed paths:
    M usr/share/rear/verify/BORG/default/400_check_archive_access.sh

  Log Message:
  -----------
  Fix missing cat in LogPrint output.


  Commit: e57f8eb465a0bac73bf7edf20b0b8a4864f1e6f9
      https://github.com/rear/rear/commit/e57f8eb465a0bac73bf7edf20b0b8a4864f1e6f9
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-01 (Fri, 01 May 2020)

  Changed paths:
    M usr/share/rear/backup/BORG/default/500_make_backup.sh
    M usr/share/rear/backup/BORG/default/800_prune_old_backups.sh
    M usr/share/rear/restore/BORG/default/400_restore_backup.sh

  Log Message:
  -----------
  Use RUNTIME_LOGFILE as suggested.

See https://github.com/rear/rear/pull/2382#discussion_r417998820


  Commit: 7e966418d15d6f2893579d2b0db7c0494cf65f88
      https://github.com/rear/rear/commit/7e966418d15d6f2893579d2b0db7c0494cf65f88
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-01 (Fri, 01 May 2020)

  Changed paths:
    M usr/share/rear/backup/BORG/default/500_make_backup.sh
    M usr/share/rear/backup/BORG/default/800_prune_old_backups.sh
    M usr/share/rear/restore/BORG/default/400_restore_backup.sh

  Log Message:
  -----------
  Ensure to append stderr to not overwrite existing content in logfile.

See https://github.com/rear/rear/pull/2382#discussion_r418018571


  Commit: 66ead8ad41485f44f8a7a16cdcaadf1e7281c3c8
      https://github.com/rear/rear/commit/66ead8ad41485f44f8a7a16cdcaadf1e7281c3c8
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-01 (Fri, 01 May 2020)

  Changed paths:
    M usr/share/rear/backup/BORG/default/500_make_backup.sh
    M usr/share/rear/backup/BORG/default/800_prune_old_backups.sh
    M usr/share/rear/restore/BORG/default/400_restore_backup.sh

  Log Message:
  -----------
  Redirect stdout similar to stderr.

See https://github.com/rear/rear/pull/2382#discussion_r418018571


  Commit: 90bf6cb742d5ecf5a76c3770895fe9de8e9ec4a3
      https://github.com/rear/rear/commit/90bf6cb742d5ecf5a76c3770895fe9de8e9ec4a3
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-01 (Fri, 01 May 2020)

  Changed paths:
    M usr/share/rear/backup/BORG/default/800_prune_old_backups.sh
    M usr/share/rear/lib/borg-functions.sh

  Log Message:
  -----------
  Adjust according to shellcheck SC2236 and SC2070.

- https://github.com/koalaman/shellcheck/wiki/SC2236
- https://github.com/koalaman/shellcheck/wiki/SC2070


  Commit: 8a68e43f459f0d66b07cbabcbeb8ef7330602976
      https://github.com/rear/rear/commit/8a68e43f459f0d66b07cbabcbeb8ef7330602976
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-01 (Fri, 01 May 2020)

  Changed paths:
    M usr/share/rear/backup/BORG/default/100_get_suffix.sh
    M usr/share/rear/backup/BORG/default/500_make_backup.sh
    M usr/share/rear/backup/BORG/default/800_prune_old_backups.sh
    M usr/share/rear/backup/BORG/default/900_umount_usb.sh
    M usr/share/rear/lib/borg-functions.sh
    M usr/share/rear/prep/BORG/default/200_prep_borg.sh
    M usr/share/rear/prep/BORG/default/250_mount_usb.sh
    M usr/share/rear/prep/BORG/default/300_init_archive.sh
    M usr/share/rear/restore/BORG/default/300_load_archives.sh
    M usr/share/rear/restore/BORG/default/400_restore_backup.sh
    M usr/share/rear/verify/BORG/default/400_check_archive_access.sh

  Log Message:
  -----------
  Adjust according to shellcheck SC2086 and SC2206.

- https://github.com/koalaman/shellcheck/wiki/SC2086
- https://github.com/koalaman/shellcheck/wiki/SC2206

Therefore e.g. make borg_additional_options an array.


  Commit: 78da9a2b0fdc1df54352c0d514b5f74af08bf462
      https://github.com/rear/rear/commit/78da9a2b0fdc1df54352c0d514b5f74af08bf462
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-01 (Fri, 01 May 2020)

  Changed paths:
    M usr/share/rear/backup/BORG/default/500_make_backup.sh
    M usr/share/rear/backup/BORG/default/800_prune_old_backups.sh
    M usr/share/rear/prep/BORG/default/300_init_archive.sh
    M usr/share/rear/restore/BORG/default/400_restore_backup.sh

  Log Message:
  -----------
  Adjust according to shellcheck SC2168.

- https://github.com/koalaman/shellcheck/wiki/SC2168

Until now in 500_make_backup.sh include_list is also array like
borg_additional_options, but doesn't have local statement.


  Commit: 56156e5dd1fe4226d706475e80b84cab47cecc64
      https://github.com/rear/rear/commit/56156e5dd1fe4226d706475e80b84cab47cecc64
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-01 (Fri, 01 May 2020)

  Changed paths:
    M usr/share/rear/lib/borg-functions.sh
    M usr/share/rear/prep/BORG/default/100_set_vars.sh
    M usr/share/rear/restore/BORG/default/300_load_archives.sh

  Log Message:
  -----------
  Adjust according to shellcheck SC2034.

- https://github.com/koalaman/shellcheck/wiki/SC2034

Since all these scripts are sourced via SourceStage ignore warnings.


  Commit: cbde2963850779c7c89ef8b0e1b4bb11ebba54f9
      https://github.com/rear/rear/commit/cbde2963850779c7c89ef8b0e1b4bb11ebba54f9
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-01 (Fri, 01 May 2020)

  Changed paths:
    M usr/share/rear/backup/BORG/default/900_umount_usb.sh
    M usr/share/rear/lib/borg-functions.sh
    M usr/share/rear/prep/BORG/default/250_mount_usb.sh
    M usr/share/rear/prep/BORG/default/300_init_archive.sh
    M usr/share/rear/verify/BORG/default/400_check_archive_access.sh

  Log Message:
  -----------
  Adjust according to shellcheck SC2154.

- https://github.com/koalaman/shellcheck/wiki/SC2154

Since all these scripts are sourced via SourceStage ignore warnings.


  Commit: 4cbfc0e6eb5f35a79f8ff21529107ded9382fce5
      https://github.com/rear/rear/commit/4cbfc0e6eb5f35a79f8ff21529107ded9382fce5
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-01 (Fri, 01 May 2020)

  Changed paths:
    M usr/share/rear/restore/BORG/default/400_restore_backup.sh

  Log Message:
  -----------
  Adjust according to shellcheck SC2164.

- https://github.com/koalaman/shellcheck/wiki/SC2164


  Commit: fde03a607dc4f4b7078fa4add66d33d122ec4745
      https://github.com/rear/rear/commit/fde03a607dc4f4b7078fa4add66d33d122ec4745
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-01 (Fri, 01 May 2020)

  Changed paths:
    M usr/share/rear/backup/BORG/default/100_get_suffix.sh
    M usr/share/rear/restore/BORG/default/300_load_archives.sh

  Log Message:
  -----------
  Adjust according to shellcheck SC2004.

- https://github.com/koalaman/shellcheck/wiki/SC2004


  Commit: 704c4de53b194a3f066dfcc29015d3870fd6f2e3
      https://github.com/rear/rear/commit/704c4de53b194a3f066dfcc29015d3870fd6f2e3
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-01 (Fri, 01 May 2020)

  Changed paths:
    M usr/share/rear/backup/BORG/default/100_get_suffix.sh
    M usr/share/rear/backup/BORG/default/500_make_backup.sh

  Log Message:
  -----------
  Adjust according to shellcheck SC2002 and SC2013.

- https://github.com/koalaman/shellcheck/wiki/SC2002
- https://github.com/koalaman/shellcheck/wiki/SC2013

In backup/BORG/default/100_get_suffix.sh additionally simplify pipe to
cut already in input for the loop.


  Commit: b1cb3442bf4c5e6610c5768bbceef501f1f232df
      https://github.com/rear/rear/commit/b1cb3442bf4c5e6610c5768bbceef501f1f232df
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-01 (Fri, 01 May 2020)

  Changed paths:
    M usr/share/rear/verify/BORG/default/400_check_archive_access.sh

  Log Message:
  -----------
  Adjusting according to shellcheck SC2015.

- https://github.com/koalaman/shellcheck/wiki/SC2015


  Commit: 04d6e8902f12a2ae39a9317c0217a6f7b1442fbc
      https://github.com/rear/rear/commit/04d6e8902f12a2ae39a9317c0217a6f7b1442fbc
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-05 (Tue, 05 May 2020)

  Changed paths:
    M usr/share/rear/conf/default.conf
    M usr/share/rear/lib/borg-functions.sh

  Log Message:
  -----------
  Better naming of variables BORGBACKUP_PRUNE_*.

Since the Borg option itself are named --keep-*, reflect that also in
the ReaR variables.

BORGBACKUP_PRUNE_WITHIN=2d could be understood as prune everything
within the last 2 days. But in Borg it becomes --keep-within 2d, which
means, keep everything in the last 2 days, but prune everything else.


  Commit: b29f8144fe7ea685b8f255eeb01038dd3c9f8776
      https://github.com/rear/rear/commit/b29f8144fe7ea685b8f255eeb01038dd3c9f8776
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-05 (Tue, 05 May 2020)

  Changed paths:
    M usr/share/rear/backup/BORG/default/800_prune_old_backups.sh

  Log Message:
  -----------
  Use correct variables BORGBACKUP_PRUNE_* now.


  Commit: 9104d34b82cfda911c2186310240a41c9ceda5c9
      https://github.com/rear/rear/commit/9104d34b82cfda911c2186310240a41c9ceda5c9
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-05 (Tue, 05 May 2020)

  Changed paths:
    M usr/share/rear/restore/BORG/default/400_restore_backup.sh

  Log Message:
  -----------
  Use correct variables BORGBACKUP_EXTRACT_* now.


  Commit: 3842944f27e65e0e24e5db88100cabdae27071be
      https://github.com/rear/rear/commit/3842944f27e65e0e24e5db88100cabdae27071be
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-05 (Tue, 05 May 2020)

  Changed paths:
    M usr/share/rear/prep/BORG/default/300_init_archive.sh

  Log Message:
  -----------
  Move success message to correct location.

Original statement would falsely report 'Successfully initialized Borg
repository.', even if no initialization was done at all.


  Commit: d80cebcb4d11245be92493d012017d65d516f432
      https://github.com/rear/rear/commit/d80cebcb4d11245be92493d012017d65d516f432
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-05 (Tue, 05 May 2020)

  Changed paths:
    M usr/share/rear/verify/BORG/default/400_check_archive_access.sh

  Log Message:
  -----------
  Revert conversion of ... && ... || statement to if-else-construct.

As discussed ... && ... || statement is used at several other places
insided ReaR, so I revert the change made, and rather disable the
shellcheck SC2015.

See https://github.com/rear/rear/pull/2382#discussion_r418651935


  Commit: a5948d5578bd5ab9155a4650259b8eed34e79c74
      https://github.com/rear/rear/commit/a5948d5578bd5ab9155a4650259b8eed34e79c74
  Author: Peter Hoffmann <hoffmann at b1-systems.de>
  Date:   2020-05-05 (Tue, 05 May 2020)

  Changed paths:
    M usr/share/rear/backup/BORG/default/500_make_backup.sh
    M usr/share/rear/backup/BORG/default/800_prune_old_backups.sh
    M usr/share/rear/restore/BORG/default/400_restore_backup.sh

  Log Message:
  -----------
  Fix comments to match current situation of stdout/stderr redirection.


  Commit: 9389c98f69530fb01249ea7829e8ddedd70bd4a3
      https://github.com/rear/rear/commit/9389c98f69530fb01249ea7829e8ddedd70bd4a3
  Author: Vladimir Gozora <c at gozora.sk>
  Date:   2020-05-10 (Sun, 10 May 2020)

  Changed paths:
    M usr/share/rear/backup/BORG/default/100_get_suffix.sh
    M usr/share/rear/backup/BORG/default/500_make_backup.sh
    M usr/share/rear/backup/BORG/default/800_prune_old_backups.sh
    M usr/share/rear/backup/BORG/default/900_umount_usb.sh
    M usr/share/rear/conf/default.conf
    M usr/share/rear/lib/borg-functions.sh
    M usr/share/rear/prep/BORG/default/100_set_vars.sh
    M usr/share/rear/prep/BORG/default/200_prep_borg.sh
    M usr/share/rear/prep/BORG/default/250_mount_usb.sh
    M usr/share/rear/prep/BORG/default/300_init_archive.sh
    M usr/share/rear/restore/BORG/default/300_load_archives.sh
    M usr/share/rear/restore/BORG/default/400_restore_backup.sh
    M usr/share/rear/verify/BORG/default/400_check_archive_access.sh

  Log Message:
  -----------
  Merge pull request #2382 from flyinggreenfrog/improve-borg

Improve borg integration into rear


Compare: https://github.com/rear/rear/compare/e300262d34a9...9389c98f6953


More information about the rear-devel mailing list