[#2786] fix grep: warning: stray \ before -

diff --git a/m4macros/ax_find_library.m4 b/m4macros/ax_find_library.m4
index 702c4e3432e485d1cec516ef5bbaa3fee6e51c51..60247ad0aff4faa3fd5a2a47fb9ebda85f778c8f 100644 (file)
--- a/m4macros/ax_find_library.m4
+++ b/m4macros/ax_find_library.m4
@@ -144,7 +144,7 @@ AC_DEFUN([AX_FIND_LIBRARY], [
 
     # Add to the runtime search path if the flag is not already added.
     if test -n "${ISC_RPATH_FLAG}" && test "$(printf '%s\n' "${LIBRARY_LIBS}" | grep -Fc -- "${ISC_RPATH_FLAG}")" = 0; then
-      library_location=$(printf '%s\n' "${LIBRARY_LIBS}" | grep -Eo '\-L.*\b' | sed 's/-L//g')
+      library_location=$(printf '%s\n' "${LIBRARY_LIBS}" | grep -Eo -- '-L.*\b' | sed 's/-L//g')
       if test -n "${library_location}"; then
         LIBRARY_LIBS="${LIBRARY_LIBS} ${ISC_RPATH_FLAG}${library_location}"
       fi

diff --git a/src/share/database/scripts/mysql/upgrade_008.1_to_008.2.sh.in b/src/share/database/scripts/mysql/upgrade_008.1_to_008.2.sh.in
index f980eef824b72fc469a79b0d16d1af094c70ae73..cb010fd0a1e572c85cd2c9fde61cd4c0fa7e6c8b 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_008.1_to_008.2.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_008.1_to_008.2.sh.in
@@ -40,7 +40,7 @@ fi
 # query information_schema for the right database.
 for arg in "${@}"
 do
-    if ! printf '%s' "${arg}" | grep -Eq '^\-\-'
+    if ! printf '%s' "${arg}" | grep -Eq -- '^--'
     then
         schema="$arg"
         break

diff --git a/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in b/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in
index 3cdd0f1e4b44940aafe199be17dab3738c3ad70b..777c8f6e74ac4be7a47847347604635ccf297dbe 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in
@@ -37,7 +37,7 @@ fi
 # query information_schema for the right database.
 for arg in "${@}"
 do
-    if ! printf '%s' "${arg}" | grep -Eq '^\-\-'
+    if ! printf '%s' "${arg}" | grep -Eq -- '^--'
     then
         schema="$arg"
         break

diff --git a/src/share/database/scripts/mysql/upgrade_010_to_011.sh.in b/src/share/database/scripts/mysql/upgrade_010_to_011.sh.in
index 12b3e947b505d7af294772b56638c15bbf1861ec..eecab224742115856bd01b2de26f7c677f3b7898 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_010_to_011.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_010_to_011.sh.in
@@ -37,7 +37,7 @@ fi
 # query information_schema for the right database.
 for arg in "${@}"
 do
-    if ! printf '%s' "${arg}" | grep -Eq '^\-\-'
+    if ! printf '%s' "${arg}" | grep -Eq -- '^--'
     then
         schema="$arg"
         break

diff --git a/src/share/database/scripts/mysql/upgrade_011_to_012.sh.in b/src/share/database/scripts/mysql/upgrade_011_to_012.sh.in
index c104c236aeccba7f1c88714daf7652b9070aa9f5..7774057df024bf0783fee5c53d848a8b503fafbf 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_011_to_012.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_011_to_012.sh.in
@@ -37,7 +37,7 @@ fi
 # query information_schema for the right database.
 for arg in "${@}"
 do
-    if ! printf '%s' "${arg}" | grep -Eq '^\-\-'
+    if ! printf '%s' "${arg}" | grep -Eq -- '^--'
     then
         schema="$arg"
         break

diff --git a/src/share/database/scripts/mysql/upgrade_012_to_013.sh.in b/src/share/database/scripts/mysql/upgrade_012_to_013.sh.in
index 0ba0db8a8eaae630d540b60649a6e1b4e1109498..b1913a00ce11c85b7c6f4ec76d9aaf975d349583 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_012_to_013.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_012_to_013.sh.in
@@ -37,7 +37,7 @@ fi
 # query information_schema for the right database.
 for arg in "${@}"
 do
-    if ! printf '%s' "${arg}" | grep -Eq '^\-\-'
+    if ! printf '%s' "${arg}" | grep -Eq -- '^--'
     then
         schema="$arg"
         break

diff --git a/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in b/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
index c70dcf2cd72f9caf24147005e90cb0d62fa4f584..b63f3b2527ad993ca7a5175380abc3d56da40099 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
@@ -37,7 +37,7 @@ fi
 # query information_schema for the right database.
 for arg in "${@}"
 do
-    if ! printf '%s' "${arg}" | grep -Eq '^\-\-'
+    if ! printf '%s' "${arg}" | grep -Eq -- '^--'
     then
         schema="$arg"
         break

diff --git a/src/share/database/scripts/mysql/upgrade_014_to_015.sh.in b/src/share/database/scripts/mysql/upgrade_014_to_015.sh.in
index fb78a855ecc2c458ed2d67c7a9103870f90b8b07..caced005ccf84d70b8bf38903ce55bec982370f5 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_014_to_015.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_014_to_015.sh.in
@@ -37,7 +37,7 @@ fi
 # query information_schema for the right database.
 for arg in "${@}"
 do
-    if ! printf '%s' "${arg}" | grep -Eq '^\-\-'
+    if ! printf '%s' "${arg}" | grep -Eq -- '^--'
     then
         schema="$arg"
         break

diff --git a/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in b/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in
index 97cf5a718979e8b785614cb3c42fdd1b28e80475..4a748b5b73155b3be95ad1813cc5e005a24482b6 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_015_to_016.sh.in
@@ -37,7 +37,7 @@ fi
 # query information_schema for the right database.
 for arg in "${@}"
 do
-    if ! printf '%s' "${arg}" | grep -Eq '^\-\-'
+    if ! printf '%s' "${arg}" | grep -Eq -- '^--'
     then
         schema="$arg"
         break

diff --git a/src/share/database/scripts/mysql/upgrade_016_to_017.sh.in b/src/share/database/scripts/mysql/upgrade_016_to_017.sh.in
index e0228f0f6bb9a949364804b70bea4a62c8486a64..f9acd97445adff06084b0dd59efad5475eb5b7fa 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_016_to_017.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_016_to_017.sh.in
@@ -37,7 +37,7 @@ fi
 # query information_schema for the right database.
 for arg in "${@}"
 do
-    if ! printf '%s' "${arg}" | grep -Eq '^\-\-'
+    if ! printf '%s' "${arg}" | grep -Eq -- '^--'
     then
         schema="$arg"
         break

diff --git a/src/share/database/scripts/mysql/upgrade_017_to_018.sh.in b/src/share/database/scripts/mysql/upgrade_017_to_018.sh.in
index fb01d7b808bbc718c35966e64d3b5211d2032951..bc6fc1b34cce5745f1e063f96c5783d02c60dd64 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_017_to_018.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_017_to_018.sh.in
@@ -37,7 +37,7 @@ fi
 # query information_schema for the right database.
 for arg in "${@}"
 do
-    if ! printf '%s' "${arg}" | grep -Eq '^\-\-'
+    if ! printf '%s' "${arg}" | grep -Eq -- '^--'
     then
         schema="$arg"
         break

diff --git a/tools/bump-lib-versions.sh b/tools/bump-lib-versions.sh
index fad6fb235c9e58456632c967560965d1cc880e4e..b21becf24d9e25cc4699d98e40169da2e6dde5a9 100755 (executable)
--- a/tools/bump-lib-versions.sh
+++ b/tools/bump-lib-versions.sh
@@ -129,7 +129,7 @@ for lib in $(git diff --name-only "${old_release_tag}" src/lib | cut -d '/' -f 3
     continue
   fi
 
-  old_version=$(grep '\-version\-info' "src/lib/${lib}/Makefile.am" | tr -s ' ' | rev | cut -d ' ' -f 1 | rev | cut -d ':' -f 1)
+  old_version=$(grep -- '-version-info' "src/lib/${lib}/Makefile.am" | tr -s ' ' | rev | cut -d ' ' -f 1 | rev | cut -d ':' -f 1)
   new_version=$((old_version + increment))
   sed -i "s/version-info .*/version-info ${new_version}:0:0/" "src/lib/${lib}/Makefile.am"
 done
@@ -141,7 +141,7 @@ if ! ${is_new_tag_stable_release} && ${is_old_tag_stable_release}; then
       continue
     fi
 
-    old_version=$(grep '\-version\-info' "src/lib/${lib}/Makefile.am" | tr -s ' ' | rev | cut -d ' ' -f 1 | rev | cut -d ':' -f 1)
+    old_version=$(grep -- '-version-info' "src/lib/${lib}/Makefile.am" | tr -s ' ' | rev | cut -d ' ' -f 1 | rev | cut -d ':' -f 1)
     new_version=$((old_version + increment_extra))
     sed -i "s/version-info .*/version-info ${new_version}:0:0/" "src/lib/${lib}/Makefile.am"
   done

diff --git a/tools/check-for-duplicate-includes.sh b/tools/check-for-duplicate-includes.sh
index 31d6beff2f83e9c90d45d317270260097ef50065..8f13b31af330231d8764904c3d5914bc4037cafb 100755 (executable)
--- a/tools/check-for-duplicate-includes.sh
+++ b/tools/check-for-duplicate-includes.sh
@@ -115,7 +115,7 @@ for i in $(get_source_files); do
   includes=$(grep -E '^#include' "${i}" | sort -V)
   unique_includes=$(grep -E '^#include' "${i}" | sort -uV)
   diff=$(posix_diff "${includes}" "${unique_includes}" | \
-    grep -F '#include' | grep -E '^\-|^\+' | sed -E 's/^([^-+ ]*)[-+ ]/\1/' )
+    grep -F '#include' | grep -E '^-|^\+' | sed -E 's/^([^-+ ]*)[-+ ]/\1/' )
   if test -n "${diff}"; then
     printf '%s has the following duplicate includes:\n%s\n\n' "${i}" "${diff}"
     found=true