Fix typos

kianmeng · kianmeng · commit 53ee88cfc69e · 2023-03-06T11:07:06.000+08:00
Found via `codespell -S templates -L claus,nd`
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@
 
 # Are we running against the minimal container, or the everything
 # container? Minimal is mostly the compiled package tools. Everything
-# pulls in scripting langauges.
+# pulls in scripting languages.
 ARG BASE_ENV=everything
 
 # Are we running tests, or a release? Tests build and run against the
@@ -66,7 +66,7 @@ EOF
 
 # Run tests against the current working directory. This is a bit
 # orthogonal to the container release process, but it has a lot of
-# same dependancies, so we reuse it. This uses COPY to allow rspect to
+# same dependencies, so we reuse it. This uses COPY to allow rspect to
 # initall the gems, but runtime usage expects you to mount a volume
 # into /src
 FROM base AS test
diff --git a/Makefile b/Makefile
@@ -58,7 +58,7 @@ release-prep:
 	make -C docs changelog_links.rst cli-reference.rst package-type-cli
 
 # Testing in docker.
-# The dot file is a sentinal file that will built a docker image, and tag it.
+# The dot file is a sentinel file that will built a docker image, and tag it.
 # The normal make target runs said image, mounting CWD against it.
 SECONDARY: .docker-test-minimal .docker-test-everything
 .docker-test-%: Gemfile.lock fpm.gemspec Dockerfile
diff --git a/docs/cli-reference.rst b/docs/cli-reference.rst
@@ -322,7 +322,7 @@ General Options
     - (osxpkg only) A file path for which to 'dont-obsolete' in the built PackageInfo. Can be specified multiple times.
 
 * ``--osxpkg-identifier-prefix IDENTIFIER_PREFIX``
-    - (osxpkg only) Reverse domain prefix prepended to package identifier, ie. 'org.great.my'. If this is omitted, the identifer will be the package name.
+    - (osxpkg only) Reverse domain prefix prepended to package identifier, ie. 'org.great.my'. If this is omitted, the identifier will be the package name.
 
 * ``--osxpkg-ownership OWNERSHIP``
     - (osxpkg only) --ownership option passed to pkgbuild. Defaults to 'recommended'. See pkgbuild(1).
@@ -556,16 +556,16 @@ General Options
     - (rpm only) Adds a custom tag in the spec file as is. Example: --rpm-tag 'Requires(post): /usr/sbin/alternatives'
 
 * ``--rpm-trigger-after-install '[OPT]PACKAGE: FILEPATH'``
-    - (rpm only) Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma seperated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
+    - (rpm only) Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma separated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
 
 * ``--rpm-trigger-after-target-uninstall '[OPT]PACKAGE: FILEPATH'``
-    - (rpm only) Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma seperated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
+    - (rpm only) Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma separated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
 
 * ``--rpm-trigger-before-install '[OPT]PACKAGE: FILEPATH'``
-    - (rpm only) Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma seperated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
+    - (rpm only) Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma separated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
 
 * ``--rpm-trigger-before-uninstall '[OPT]PACKAGE: FILEPATH'``
-    - (rpm only) Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma seperated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
+    - (rpm only) Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma separated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
 
 * ``--[no-]rpm-use-file-permissions``
     - (rpm only) Use existing file permissions when defining ownership and modes.
@@ -595,7 +595,7 @@ General Options
     - (solaris only) Set the user to USER in the prototype files.
 
 * ``--source-date-epoch-default SOURCE_DATE_EPOCH_DEFAULT``
-    - If no release date otherwise specified, use this value as timestamp on generated files to reduce nondeterminism. Reproducible build environments such as dpkg-dev and rpmbuild set this via envionment variable SOURCE_DATE_EPOCH variable to the integer unix timestamp to use in generated archives, and expect tools like fpm to use it as a hint to avoid nondeterministic output. This is a Unix timestamp, i.e. number of seconds since 1 Jan 1970 UTC. See https://reproducible-builds.org/specs/source-date-epoch 
+    - If no release date otherwise specified, use this value as timestamp on generated files to reduce nondeterminism. Reproducible build environments such as dpkg-dev and rpmbuild set this via environment variable SOURCE_DATE_EPOCH variable to the integer unix timestamp to use in generated archives, and expect tools like fpm to use it as a hint to avoid nondeterministic output. This is a Unix timestamp, i.e. number of seconds since 1 Jan 1970 UTC. See https://reproducible-builds.org/specs/source-date-epoch 
 
 * ``--source-date-epoch-from-changelog``
     - Use release date from changelog as timestamp on generated files to reduce nondeterminism. Experimental; only implemented for gem so far. 
@@ -634,7 +634,7 @@ General Options
     - (virtualenv only) PyPi Server uri for retrieving packages.
 
 * ``--virtualenv-pypi-extra-url PYPI_EXTRA_URL``
-    - (virtualenv only) PyPi extra-index-url for pointing to your priviate PyPi
+    - (virtualenv only) PyPi extra-index-url for pointing to your private PyPi
 
 * ``--[no-]virtualenv-setup-install``
     - (virtualenv only) After building virtualenv run setup.py install useful when building a virtualenv for packages and including their requirements from 
@@ -816,7 +816,7 @@ osxpkg
 * ``--osxpkg-dont-obsolete DONT_OBSOLETE_PATH``
     - A file path for which to 'dont-obsolete' in the built PackageInfo. Can be specified multiple times.
 * ``--osxpkg-identifier-prefix IDENTIFIER_PREFIX``
-    - Reverse domain prefix prepended to package identifier, ie. 'org.great.my'. If this is omitted, the identifer will be the package name.
+    - Reverse domain prefix prepended to package identifier, ie. 'org.great.my'. If this is omitted, the identifier will be the package name.
 * ``--osxpkg-ownership OWNERSHIP``
     - --ownership option passed to pkgbuild. Defaults to 'recommended'. See pkgbuild(1).
 * ``--[no-]osxpkg-payload-free``
@@ -992,13 +992,13 @@ rpm
 * ``--rpm-tag TAG``
     - Adds a custom tag in the spec file as is. Example: --rpm-tag 'Requires(post): /usr/sbin/alternatives'
 * ``--rpm-trigger-after-install '[OPT]PACKAGE: FILEPATH'``
-    - Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma seperated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
+    - Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma separated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
 * ``--rpm-trigger-after-target-uninstall '[OPT]PACKAGE: FILEPATH'``
-    - Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma seperated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
+    - Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma separated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
 * ``--rpm-trigger-before-install '[OPT]PACKAGE: FILEPATH'``
-    - Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma seperated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
+    - Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma separated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
 * ``--rpm-trigger-before-uninstall '[OPT]PACKAGE: FILEPATH'``
-    - Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma seperated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
+    - Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma separated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
 * ``--[no-]rpm-use-file-permissions``
     - Use existing file permissions when defining ownership and modes.
 * ``--rpm-user USER``
@@ -1052,7 +1052,7 @@ virtualenv
 * ``--virtualenv-pypi PYPI_URL``
     - PyPi Server uri for retrieving packages.
 * ``--virtualenv-pypi-extra-url PYPI_EXTRA_URL``
-    - PyPi extra-index-url for pointing to your priviate PyPi
+    - PyPi extra-index-url for pointing to your private PyPi
 * ``--[no-]virtualenv-setup-install``
     - After building virtualenv run setup.py install useful when building a virtualenv for packages and including their requirements from 
 * ``--[no-]virtualenv-system-site-packages``
diff --git a/docs/packages/cli/osxpkg.rst b/docs/packages/cli/osxpkg.rst
@@ -1,7 +1,7 @@
 * ``--osxpkg-dont-obsolete DONT_OBSOLETE_PATH``
     - A file path for which to 'dont-obsolete' in the built PackageInfo. Can be specified multiple times.
 * ``--osxpkg-identifier-prefix IDENTIFIER_PREFIX``
-    - Reverse domain prefix prepended to package identifier, ie. 'org.great.my'. If this is omitted, the identifer will be the package name.
+    - Reverse domain prefix prepended to package identifier, ie. 'org.great.my'. If this is omitted, the identifier will be the package name.
 * ``--osxpkg-ownership OWNERSHIP``
     - --ownership option passed to pkgbuild. Defaults to 'recommended'. See pkgbuild(1).
 * ``--[no-]osxpkg-payload-free``
diff --git a/docs/packages/cli/rpm.rst b/docs/packages/cli/rpm.rst
@@ -51,13 +51,13 @@
 * ``--rpm-tag TAG``
     - Adds a custom tag in the spec file as is. Example: --rpm-tag 'Requires(post): /usr/sbin/alternatives'
 * ``--rpm-trigger-after-install '[OPT]PACKAGE: FILEPATH'``
-    - Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma seperated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
+    - Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma separated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
 * ``--rpm-trigger-after-target-uninstall '[OPT]PACKAGE: FILEPATH'``
-    - Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma seperated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
+    - Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma separated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
 * ``--rpm-trigger-before-install '[OPT]PACKAGE: FILEPATH'``
-    - Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma seperated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
+    - Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma separated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
 * ``--rpm-trigger-before-uninstall '[OPT]PACKAGE: FILEPATH'``
-    - Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma seperated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
+    - Adds a rpm trigger script located in FILEPATH, having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma separated list of packages. See: http://rpm.org/api/4.4.2.2/triggers.html
 * ``--[no-]rpm-use-file-permissions``
     - Use existing file permissions when defining ownership and modes.
 * ``--rpm-user USER``
diff --git a/docs/packages/cli/virtualenv.rst b/docs/packages/cli/virtualenv.rst
@@ -11,7 +11,7 @@
 * ``--virtualenv-pypi PYPI_URL``
     - PyPi Server uri for retrieving packages.
 * ``--virtualenv-pypi-extra-url PYPI_EXTRA_URL``
-    - PyPi extra-index-url for pointing to your priviate PyPi
+    - PyPi extra-index-url for pointing to your private PyPi
 * ``--[no-]virtualenv-setup-install``
     - After building virtualenv run setup.py install useful when building a virtualenv for packages and including their requirements from 
 * ``--[no-]virtualenv-system-site-packages``
diff --git a/docs/packages/dir.rst b/docs/packages/dir.rst
@@ -40,7 +40,7 @@ The above shell will find the latest version of ``kubectl`` and download it. We'
 
 .. note::
   We use ``${version#v*}`` in our shell to set the package version. This is
-  because Kuberenetes versions have a text that starts with "v" and this is not
+  because Kubernetes versions have a text that starts with "v" and this is not
   valid in Debian packages. This will turn "v1.2.3" into "1.2.3" for our package.
 
 Now we can check our package to make sure it looks the way we want::
diff --git a/docs/packages/pleaserun.rst b/docs/packages/pleaserun.rst
@@ -1,7 +1,7 @@
 pleaserun - Pleaserun services
 ==============================
 
-Pleaserun helps generate service definitions for a variety of service manangers
+Pleaserun helps generate service definitions for a variety of service managers
 such as systemd and sysv.
 
 When used as an input, fpm will generate a package that include multiple service
diff --git a/lib/fpm/command.rb b/lib/fpm/command.rb
@@ -240,7 +240,7 @@ def help(*args)
 
   option "--source-date-epoch-default", "SOURCE_DATE_EPOCH_DEFAULT",
     "If no release date otherwise specified, use this value as timestamp on generated files to reduce nondeterminism. " \
-    "Reproducible build environments such as dpkg-dev and rpmbuild set this via envionment variable SOURCE_DATE_EPOCH " \
+    "Reproducible build environments such as dpkg-dev and rpmbuild set this via environment variable SOURCE_DATE_EPOCH " \
     "variable to the integer unix timestamp to use in generated archives, " \
     "and expect tools like fpm to use it as a hint to avoid nondeterministic output. " \
     "This is a Unix timestamp, i.e. number of seconds since 1 Jan 1970 UTC. " \
diff --git a/lib/fpm/package.rb b/lib/fpm/package.rb
@@ -44,7 +44,7 @@ def to_s
 
   # The epoch version of this package
   # This is used most when an upstream package changes it's versioning
-  # style so standard comparisions wouldn't work.
+  # style so standard comparisons wouldn't work.
   attr_accessor :epoch
 
   # The iteration of this package.
@@ -180,7 +180,7 @@ def initialize
     @attrs = {}
 
     build_path
-    # Dont' initialize staging_path just yet, do it lazily so subclass can get a word in.
+    # Don't initialize staging_path just yet, do it lazily so subclass can get a word in.
   end # def initialize
 
   # Get the 'type' for this instance.
diff --git a/lib/fpm/package/cpan.rb b/lib/fpm/package/cpan.rb
@@ -6,7 +6,7 @@
 require "pathname"
 
 class FPM::Package::CPAN < FPM::Package
-  # Flags '--foo' will be accessable  as attributes[:npm_foo]
+  # Flags '--foo' will be accessible  as attributes[:npm_foo]
   option "--perl-bin", "PERL_EXECUTABLE",
     "The path to the perl executable you wish to run.", :default => "perl"
 
diff --git a/lib/fpm/package/deb.rb b/lib/fpm/package/deb.rb
@@ -1069,7 +1069,7 @@ def add_path(path, allconfigs)
             FileUtils.mkdir_p(File.dirname(dcl))
             FileUtils.cp_r path, dcl
           else
-            logger.debug("Config file aready exists in staging area.")
+            logger.debug("Config file already exists in staging area.")
           end
         end
       end
diff --git a/lib/fpm/package/dir.rb b/lib/fpm/package/dir.rb
@@ -110,7 +110,7 @@ def output(output_path)
   # Copy a file or directory to a destination
   #
   # This is special because it respects the full path of the source.
-  # Aditionally, hardlinks will be used instead of copies.
+  # Additionally, hardlinks will be used instead of copies.
   #
   # Example:
   #
diff --git a/lib/fpm/package/gem.rb b/lib/fpm/package/gem.rb
@@ -15,7 +15,7 @@
 # * :gem_package_name_prefix
 # * :gem_gem
 class FPM::Package::Gem < FPM::Package
-  # Flags '--foo' will be accessable  as attributes[:gem_foo]
+  # Flags '--foo' will be accessible  as attributes[:gem_foo]
   option "--bin-path", "DIRECTORY", "The directory to install gem executables"
   option "--package-prefix", "NAMEPREFIX",
     "(DEPRECATED, use --package-name-prefix) Name to prefix the package " \
diff --git a/lib/fpm/package/npm.rb b/lib/fpm/package/npm.rb
@@ -7,7 +7,7 @@ class FPM::Package::NPM < FPM::Package
   class << self
     include FPM::Util
   end
-  # Flags '--foo' will be accessable  as attributes[:npm_foo]
+  # Flags '--foo' will be accessible  as attributes[:npm_foo]
   option "--bin", "NPM_EXECUTABLE",
     "The path to the npm executable you wish to run.", :default => "npm"
 
diff --git a/lib/fpm/package/osxpkg.rb b/lib/fpm/package/osxpkg.rb
@@ -22,7 +22,7 @@ class FPM::Package::OSXpkg < FPM::Package
 
   option "--identifier-prefix", "IDENTIFIER_PREFIX",
     "Reverse domain prefix prepended to package identifier, " \
-    "ie. 'org.great.my'. If this is omitted, the identifer " \
+    "ie. 'org.great.my'. If this is omitted, the identifier " \
     "will be the package name."
   option "--payload-free", :flag, "Define no payload, assumes use of script options.",
     :default => false
diff --git a/lib/fpm/package/pacman.rb b/lib/fpm/package/pacman.rb
@@ -59,7 +59,7 @@ def config_files
 
   def dependencies
     bogus_regex = /[^\sA-Za-z0-9><=+._@-]/
-    # Actually modifies depencies if they are not right
+    # Actually modifies dependencies if they are not right
     bogus_dependencies = @dependencies.grep bogus_regex
     if bogus_dependencies.any?
       @dependencies.reject! { |a| a =~ bogus_regex }
diff --git a/lib/fpm/package/python.rb b/lib/fpm/package/python.rb
@@ -18,7 +18,7 @@
 #     pkg.input("Django")
 #
 class FPM::Package::Python < FPM::Package
-  # Flags '--foo' will be accessable  as attributes[:python_foo]
+  # Flags '--foo' will be accessible  as attributes[:python_foo]
   option "--bin", "PYTHON_EXECUTABLE",
     "The path to the python executable you wish to run.", :default => "python"
   option "--easyinstall", "EASYINSTALL_EXECUTABLE",
diff --git a/lib/fpm/package/rpm.rb b/lib/fpm/package/rpm.rb
@@ -174,7 +174,7 @@ class FPM::Package::RPM < FPM::Package
   ["before-install","after-install","before-uninstall","after-target-uninstall"].each do |trigger_type|
      rpm_trigger = []
      option "--trigger-#{trigger_type}", "'[OPT]PACKAGE: FILEPATH'", "Adds a rpm trigger script located in FILEPATH, " \
-            "having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma seperated list of packages. " \
+            "having 'OPT' options and linking to 'PACKAGE'. PACKAGE can be a comma separated list of packages. " \
             "See: http://rpm.org/api/4.4.2.2/triggers.html" do |trigger|
        match = trigger.match(/^(\[.*\]|)(.*): (.*)$/)
        @logger.fatal("Trigger '#{trigger_type}' definition can't be parsed ('#{trigger}')") unless match
diff --git a/lib/fpm/package/virtualenv.rb b/lib/fpm/package/virtualenv.rb
@@ -9,7 +9,7 @@
 # This supports input, but not output.
 #
 class FPM::Package::Virtualenv < FPM::Package
-  # Flags '--foo' will be accessable  as attributes[:virtualenv_foo]
+  # Flags '--foo' will be accessible  as attributes[:virtualenv_foo]
 
   option "--pypi", "PYPI_URL",
   "PyPi Server uri for retrieving packages.",
@@ -31,7 +31,7 @@ class FPM::Package::Virtualenv < FPM::Package
   "specified directory may be added to the package. This is useful if the " \
   "virtualenv needs configuration files, etc.", :default => nil
   option "--pypi-extra-url", "PYPI_EXTRA_URL",
-    "PyPi extra-index-url for pointing to your priviate PyPi",
+    "PyPi extra-index-url for pointing to your private PyPi",
     :multivalued => true, :attribute_name => :virtualenv_pypi_extra_index_urls,
     :default => nil
 
diff --git a/lib/fpm/util.rb b/lib/fpm/util.rb
@@ -90,7 +90,7 @@ def default_shell
   # OPTIONS:
   #
   #   :process (default: false) -- pass process object as the first argument the to block,
-  #   :stdin   (default: true)  -- pass stdin object of the child process to the block for writting,
+  #   :stdin   (default: true)  -- pass stdin object of the child process to the block for writing,
   #   :stdout  (default: true)  -- pass stdout object of the child process to the block for reading,
   #   :stderr  (default: true)  -- pass stderr object of the child process to the block for reading,
   #
diff --git a/spec/fpm/package/deb_spec.rb b/spec/fpm/package/deb_spec.rb
@@ -570,7 +570,7 @@ def dpkg_field(field)
           skip("Missing lintian program") unless have_lintian
 
           # Have lintian run with only one check. The goal here is to check if
-          # lintian crashes or not. This 'symlinks' check would normaly check
+          # lintian crashes or not. This 'symlinks' check would normally check
           # for broken symlinks. Since this package has no files, this check
           # should always succeed. It would fail if fpm generated any invalid
           # packages, such as ones with a bzip2-compressed control.tar file (#1840)
diff --git a/spec/fpm/package/pacman_spec.rb b/spec/fpm/package/pacman_spec.rb
diff --git a/templates/sh.erb b/templates/sh.erb
