[libmicrohttpd2] 03/21: bootstrap: English fixes

[Admin]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a commit to branch master
in repository libmicrohttpd2.

commit 3acd1a8a2562a4d3497c33a7c60d45d3c4eb3d2e
Author: Evgeny Grin (Karlson2k) <k2k@drgrin.dev>
AuthorDate: Wed Jun 11 18:24:23 2025 +0200

    bootstrap: English fixes
---
 bootstrap | 47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/bootstrap b/bootstrap
index d7ac9e8..26ac06b 100755
--- a/bootstrap
+++ b/bootstrap
@@ -17,17 +17,17 @@ have_cmd()
 }
 fi
 
-# Extract dotted digits version from stdin and print it to stdout
+# Extract the dotted version string from stdin and write it to stdout
 ver_filter()
 {
   ${SED-sed} -n 
's/^\(.*[^0-9.]\)\{0,1\}\([0-9][0-9]*\(\.[0-9][0-9]*\)\{0,4\}\).*$/\2/p'
 }
 
 # Compare two version strings
-# Return:
+# Return codes:
 # * 11 if the first version is greater than the second version
 # * 10 if versions are equal
-# *  9 if the first version is less than the second version
+# * 9  if the first version is less than the second version
 __helper_ver_cmp()
 {
   _verA=$1
@@ -60,6 +60,7 @@ ver_cmp()
   [ $? $2 10 ]
 }
 
+# Locate the bootstrap source directory
 bs_srcdir='' || exit 1
 if have_cmd 'dirname' && test X"`dirname / 2>/dev/null`" = X"/"; then
   bs_srcdir=`dirname $0` || exit 2
@@ -70,14 +71,14 @@ else
   esac
 fi
 
-test -n "$bs_srcdir" && cd "$bs_srcdir" || echo "Warning: cannot detect 
sources directory" 1>&2
+test -n "$bs_srcdir" && cd "$bs_srcdir" || echo "Warning: cannot detect the 
source directory" 1>&2
 
 if test ! -f './configure.ac'; then
-  echo "Error: no 'configure.ac' found. Wrong sources directory?" 1>&2
+  echo "Error: 'configure.ac' not found. Wrong source directory?" 1>&2
   exit 2
 fi
 if test ! -f './src/include/microhttpd2.h'; then
-  echo "Error: file 'src/include/microhttpd2.h' not found. Wrong sources 
directory?" 1>&2
+  echo "Error: 'src/include/microhttpd2.h' not found. Wrong source directory?" 
1>&2
   exit 2
 fi
 
@@ -88,19 +89,19 @@ if have_cmd ${UNCRUSTIFY}; then
   UNCRUSTIFY_VER_NEEDED="0.78.0"
   if ver_cmp "$UNCRUSTIFY_VER" -ge "$UNCRUSTIFY_VER_NEEDED"; then
     if test -f uncrustify.cfg; then
-      echo "Uncrustify configuration already exists, skipping installation 
from the upstream file."
+      echo "Uncrustify configuration already exists; skipping installation of 
the configuration from the upstream file."
     else
-      echo "Installing libmicrohttpd uncrustify configuration"
+      echo "Installing the libmicrohttpd Uncrustify configuration"
       rm -f ./uncrustify.cfg
       ln -s contrib/uncrustify.cfg uncrustify.cfg || \
         cp contrib/uncrustify.cfg uncrustify.cfg || \
-        echo "Failed to install uncrustify configuration file" 1>&2
+        echo "Failed to install Uncrustify configuration file" 1>&2
     fi
   else
-    echo "Uncrustify version $UNCRUSTIFY_VER detected, hook not installed. 
Please install uncrustify $UNCRUSTIFY_VER_NEEDED or newer if you plan to 
contribute to development."
+    echo "Uncrustify version $UNCRUSTIFY_VER detected -- hook not installed. 
Please install Uncrustify $UNCRUSTIFY_VER_NEEDED or newer if you plan to 
contribute to development."
   fi
 else
-  echo "Uncrustify not detected, hook not installed. Please install uncrustify 
$UNCRUSTIFY_VER_NEEDED or newer if you plan to contribute to development."
+  echo "Uncrustify not detected -- hook not installed. Please install 
Uncrustify $UNCRUSTIFY_VER_NEEDED or newer if you plan to contribute to 
development."
 fi
 
 test -n "$GIT" || GIT="$GIT_CMD"
@@ -111,7 +112,7 @@ if test -d "${GIT_DIR-.git}"; then
   if have_cmd "$GIT"; then
     ver_GIT=`"$GIT" --version 2>/dev/null | ver_filter`
     if ver_cmp "$ver_GIT" -lt "1.7"; then
-      echo "git version $ver_GIT detected. If you plan to contribute to 
development, consider installing a modern Git version."
+      echo "Git version $ver_GIT detected. If you plan to contribute to 
development, consider installing a modern Git version."
     else
       if test -f "${GIT_DIR-.git}/mhd2_special_config"; then :; else
         git_settings_modified='no'
@@ -133,16 +134,16 @@ if test -d "${GIT_DIR-.git}"; then
           fi
         fi
         if test "$git_settings_modified" != "no"; then
-          echo "Some git repository settings has been modified."
-          echo "Use next command to prevent such modifications in the future:"
+          echo "Some Git repository settings have been modified."
+          echo "Use the following command to prevent such modifications in the 
future:"
           echo "  touch '${GIT_DIR-.git}/mhd2_special_config'"
         fi
       fi
       if test -f uncrustify.cfg && have_cmd ${UNCRUSTIFY}; then
         if test -f "${GIT_DIR-.git}/hooks/pre-commit"; then
-          echo "Pre-commit git hook already exists, skipping installation from 
the upstream file."
+          echo "Pre-commit Git hook already exists; skipping installation of 
the upstream file."
         else
-          echo "Installing uncrustify pre-commit git hook"
+          echo "Installing Uncrustify pre-commit Git hook"
           rm -f "${GIT_DIR-.git}/hooks/pre-commit"
           if test ${GIT_DIR+y}; then
             ln -s "`pwd`/contrib/precommit_hook.sh" 
"${GIT_DIR}/hooks/pre-commit"
@@ -150,14 +151,14 @@ if test -d "${GIT_DIR-.git}"; then
             ln -s ../../contrib/precommit_hook.sh .git/hooks/pre-commit
           fi
           test $? -eq 0 || cp contrib/precommit_hook.sh 
"${GIT_DIR-.git}/hooks/pre-commit" || \
-            echo "Failed to install pre-commit git hook" 1>&2
+            echo "Failed to install pre-commit Git hook" 1>&2
           if test -f "${GIT_DIR-.git}/hooks/pre-commit"; then
-            if test chmod +x "${GIT_DIR-.git}/hooks/pre-commit"; then :; else
+            if chmod +x "${GIT_DIR-.git}/hooks/pre-commit"; then :; else
               echo "Failed to mark the pre-commit Git hook as executable" 1>&2
             fi
             if dir_GIT_HOOKS=`"$GIT" config --get core.hooksPath 2>/dev/null` 
&& test "X$dir_GIT_HOOKS" != "X${GIT_DIR-.git}/hooks"; then
-              echo "Installed hook will not be used due to git configuration."
-              echo "Consider updating git configuration by running the 
following command:"
+              echo "The installed hook will not be used due to the current Git 
configuration."
+              echo "Consider updating the Git configuration by running the 
following command:"
               echo "  '$GIT' config --local core.hooksPath 
'${GIT_DIR-.git}/hooks'"
             fi
           fi
@@ -165,10 +166,10 @@ if test -d "${GIT_DIR-.git}"; then
       fi
     fi
   else
-    echo "No 'git' command detected, skipping installation of pre-commit git 
hook and git configuration."
+    echo "No 'git' command detected; skipping installation of the pre-commit 
Git hook and Git configuration."
   fi
 else
-  echo "No '${GIT_DIR-.git}' directory found, skipping installation of 
pre-commit git hook and git configuration."
+  echo "No '${GIT_DIR-.git}' directory found; skipping installation of the 
pre-commit Git hook and Git configuration."
 fi
 
 WANT_AUTOCONF=latest
@@ -177,4 +178,4 @@ export WANT_AUTOCONF
 export WANT_AUTOMAKE
 
 autoreconf -vi ${1+"$@"} || \
-  echo "*** Failed to build autoconf output files ***" >&2
+  echo "*** Failed to build Autoconf output files ***" >&2

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.