瀏覽代碼

Merge pull request #6884 from a1346054/fixes

Fix typos and shellcheck warnings
TW 2 年之前
父節點
當前提交
a75b260fef

+ 1 - 1
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
  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 `<client fqdn>` folder.
 The server should automatically change the current working directory to the `<client fqdn>` folder.
 
 
 ::
 ::

+ 1 - 1
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.
 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:
 path:
     The filename/path of the *Item* (file, directory, symlink).
     The filename/path of the *Item* (file, directory, symlink).

+ 1 - 1
scripts/sdist-sign

@@ -17,4 +17,4 @@ python setup.py sdist
 
 
 D=dist/borgbackup-$R.tar.gz
 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"

+ 2 - 2
scripts/sign-binaries

@@ -14,7 +14,7 @@ else
 fi
 fi
 
 
 for file in dist/borg-*; do
 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
 done
 
 
-touch -t $D dist/*
+touch -t "$D" dist/*

+ 1 - 1
scripts/upload-pypi

@@ -15,4 +15,4 @@ fi
 
 
 D=dist/borgbackup-$R.tar.gz
 D=dist/borgbackup-$R.tar.gz
 
 
-twine upload $D.asc $D
+twine upload "$D.asc" "$D"

+ 1 - 1
src/borg/archiver.py

@@ -2653,7 +2653,7 @@ class Archiver:
         The first matching pattern is used, so if an include pattern matches
         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
         before an exclude pattern, the file is backed up. Note that a no-recurse
         exclude stops examination of subdirectories so that potential includes
         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**::
         **Tip: You can easily test your patterns with --dry-run and  --list**::