Merge pull request #5234 from kit-ty-kate/5233-backport

Backport #5233 in 2.1
ocaml · Aug 10, 2022 · df08094 · df08094
2 parents c69fecc + 8ac491e
commit df08094
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -50,7 +50,7 @@ are not marked). Those prefixed with "(+)" are new command/option (since
 * Update test engine to allow for additional tests [#4913 #4966 #4979 #5004
   #5009 #5024 #5097 @AltGr @kit-ty-kate @rjbou]
 * Update for git protocol deprecation on GitHub [#5097 @rjbou]
-* When building opam, do not fail if curl/wget is missing [#5223 @kit-ty-kate]
+* When building opam, do not fail if curl/wget is missing [#5223 #5233 @kit-ty-kate]
 
 2.1.2:
 * Fallback on dnf if yum does not exist on RHEL-based systems [#4825 @kit-ty-kate]

diff --git a/shell/bootstrap-ocaml.sh b/shell/bootstrap-ocaml.sh
@@ -7,7 +7,7 @@ if command -v curl > /dev/null; then
 elif command -v wget > /dev/null; then
   CURL=wget
 else
-  echo "[WARNING] This script requires curl or wget"
+  echo "[WARNING] This script may need curl or wget"
 fi
 BOOTSTRAP_DIR=${BOOTSTRAP_DIR:-bootstrap}
 BOOTSTRAP_ROOT=${BOOTSTRAP_ROOT:-..}