From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Mon, 17 Feb 2025 08:39:29 +0000 (+0100)
Subject: Fix typos found by Miod in gen-version
X-Git-Tag: dnsdist-2.0.0-alpha1~83^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F15163%2Fhead;p=thirdparty%2Fpdns.git

Fix typos found by Miod in gen-version
---

diff --git a/builder-support/gen-version b/builder-support/gen-version
index c2a56b451b..2e44d05410 100755
--- a/builder-support/gen-version
+++ b/builder-support/gen-version
@@ -10,7 +10,7 @@ DIRTY=""
 git status | grep -q clean || DIRTY='.dirty'
 
 # Special environment variable to signal that we are building a release, as this
-# has consequenses for the version number.
+# has consequences for the version number.
 if [ "${IS_RELEASE}" = "YES" ]; then
   TAG="$(git describe --tags --exact-match 2> /dev/null | cut -d- -f 2-)"
   if [ -n "${TAG}" ]; then
@@ -53,7 +53,7 @@ if [ ! -z "$(git rev-parse --abbrev-ref HEAD 2> /dev/null)" ]; then
     # We used 0.0.XXXXgHASH for master in the previous incarnation of our build pipeline.
     # This now becomes 0.0.XXXX.0.gHASH, as 0.0.0.XXXX.gHASH (which is more correct)
     # would break upgrades for those running master
-    # This _should_ be ok for forever is we stick to X.Y.Z for version numbers
+    # This _should_ be ok for forever if we stick to X.Y.Z for version numbers
     LAST_TAG=0.0
     COMMITS_SINCE_TAG="$(git rev-list --count 12c868770afc20b6cc0da439d881105151d557dd..HEAD 2> /dev/null).0"
     [ "${COMMITS_SINCE_TAG}" = ".0" ] && COMMITS_SINCE_TAG=0.0
diff --git a/pdns/dnsdistdist/builder-support/gen-version b/pdns/dnsdistdist/builder-support/gen-version
index c2a56b451b..2e44d05410 100755
--- a/pdns/dnsdistdist/builder-support/gen-version
+++ b/pdns/dnsdistdist/builder-support/gen-version
@@ -10,7 +10,7 @@ DIRTY=""
 git status | grep -q clean || DIRTY='.dirty'
 
 # Special environment variable to signal that we are building a release, as this
-# has consequenses for the version number.
+# has consequences for the version number.
 if [ "${IS_RELEASE}" = "YES" ]; then
   TAG="$(git describe --tags --exact-match 2> /dev/null | cut -d- -f 2-)"
   if [ -n "${TAG}" ]; then
@@ -53,7 +53,7 @@ if [ ! -z "$(git rev-parse --abbrev-ref HEAD 2> /dev/null)" ]; then
     # We used 0.0.XXXXgHASH for master in the previous incarnation of our build pipeline.
     # This now becomes 0.0.XXXX.0.gHASH, as 0.0.0.XXXX.gHASH (which is more correct)
     # would break upgrades for those running master
-    # This _should_ be ok for forever is we stick to X.Y.Z for version numbers
+    # This _should_ be ok for forever if we stick to X.Y.Z for version numbers
     LAST_TAG=0.0
     COMMITS_SINCE_TAG="$(git rev-list --count 12c868770afc20b6cc0da439d881105151d557dd..HEAD 2> /dev/null).0"
     [ "${COMMITS_SINCE_TAG}" = ".0" ] && COMMITS_SINCE_TAG=0.0
diff --git a/pdns/recursordist/builder-support/gen-version b/pdns/recursordist/builder-support/gen-version
index c2a56b451b..2e44d05410 100755
--- a/pdns/recursordist/builder-support/gen-version
+++ b/pdns/recursordist/builder-support/gen-version
@@ -10,7 +10,7 @@ DIRTY=""
 git status | grep -q clean || DIRTY='.dirty'
 
 # Special environment variable to signal that we are building a release, as this
-# has consequenses for the version number.
+# has consequences for the version number.
 if [ "${IS_RELEASE}" = "YES" ]; then
   TAG="$(git describe --tags --exact-match 2> /dev/null | cut -d- -f 2-)"
   if [ -n "${TAG}" ]; then
@@ -53,7 +53,7 @@ if [ ! -z "$(git rev-parse --abbrev-ref HEAD 2> /dev/null)" ]; then
     # We used 0.0.XXXXgHASH for master in the previous incarnation of our build pipeline.
     # This now becomes 0.0.XXXX.0.gHASH, as 0.0.0.XXXX.gHASH (which is more correct)
     # would break upgrades for those running master
-    # This _should_ be ok for forever is we stick to X.Y.Z for version numbers
+    # This _should_ be ok for forever if we stick to X.Y.Z for version numbers
     LAST_TAG=0.0
     COMMITS_SINCE_TAG="$(git rev-list --count 12c868770afc20b6cc0da439d881105151d557dd..HEAD 2> /dev/null).0"
     [ "${COMMITS_SINCE_TAG}" = ".0" ] && COMMITS_SINCE_TAG=0.0