From 160dd877ab6b1e4908697fcf3ca15e869d076cef Mon Sep 17 00:00:00 2001 From: a1346054 <36859588+a1346054@users.noreply.github.com> Date: Fri, 22 Jul 2022 15:06:47 +0000 Subject: [PATCH 1/2] fix typos --- docs/deployment/central-backup-server.rst | 2 +- docs/internals/frontends.rst | 2 +- src/borg/archiver.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/deployment/central-backup-server.rst b/docs/deployment/central-backup-server.rst index 431bd531e..047ca4437 100644 --- a/docs/deployment/central-backup-server.rst +++ b/docs/deployment/central-backup-server.rst @@ -95,7 +95,7 @@ The client needs to initialize the `pictures` repository like this: borg init backup@backup01.srv.local:pictures -Or with the full path (should actually never be used, as only for demonstrational purposes). +Or with the full path (should actually never be used, as only for demonstration purposes). The server should automatically change the current working directory to the `` folder. :: diff --git a/docs/internals/frontends.rst b/docs/internals/frontends.rst index 2fc1ab0a6..e239784cb 100644 --- a/docs/internals/frontends.rst +++ b/docs/internals/frontends.rst @@ -458,7 +458,7 @@ Archive Differencing ++++++++++++++++++++ Each archive difference item (file contents, user/group/mode) output by :ref:`borg_diff` is represented by an *ItemDiff* object. -The propertiese of an *ItemDiff* object are: +The properties of an *ItemDiff* object are: path: The filename/path of the *Item* (file, directory, symlink). diff --git a/src/borg/archiver.py b/src/borg/archiver.py index 87a0dd83a..431f5e99f 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -2653,7 +2653,7 @@ def do_break_lock(self, args, repository): The first matching pattern is used, so if an include pattern matches before an exclude pattern, the file is backed up. Note that a no-recurse exclude stops examination of subdirectories so that potential includes - will not match - use normal exludes for such use cases. + will not match - use normal excludes for such use cases. **Tip: You can easily test your patterns with --dry-run and --list**:: From 41d67bc44912c87973fb4de2ac53fa11f1b54711 Mon Sep 17 00:00:00 2001 From: a1346054 <36859588+a1346054@users.noreply.github.com> Date: Fri, 22 Jul 2022 15:48:02 +0000 Subject: [PATCH 2/2] fix shellcheck warnings in bash scripts --- scripts/sdist-sign | 2 +- scripts/sign-binaries | 4 ++-- scripts/upload-pypi | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/sdist-sign b/scripts/sdist-sign index 50758a30a..1186bdee8 100755 --- a/scripts/sdist-sign +++ b/scripts/sdist-sign @@ -17,4 +17,4 @@ python setup.py sdist D=dist/borgbackup-$R.tar.gz -$GPG --detach-sign --local-user "Thomas Waldmann" --armor --output $D.asc $D +$GPG --detach-sign --local-user "Thomas Waldmann" --armor --output "$D.asc" "$D" diff --git a/scripts/sign-binaries b/scripts/sign-binaries index 4f145be75..ecbefda13 100755 --- a/scripts/sign-binaries +++ b/scripts/sign-binaries @@ -14,7 +14,7 @@ else fi for file in dist/borg-*; do - $GPG --local-user "Thomas Waldmann" --armor --detach-sign --output $file.asc $file + $GPG --local-user "Thomas Waldmann" --armor --detach-sign --output "$file.asc" "$file" done -touch -t $D dist/* +touch -t "$D" dist/* diff --git a/scripts/upload-pypi b/scripts/upload-pypi index db0ef45f3..618e36f82 100755 --- a/scripts/upload-pypi +++ b/scripts/upload-pypi @@ -15,4 +15,4 @@ fi D=dist/borgbackup-$R.tar.gz -twine upload $D.asc $D +twine upload "$D.asc" "$D"