mirror of
https://gitlab.isc.org/isc-projects/kea
synced 2025-08-22 01:49:48 +00:00
[#2786] fix grep: warning: stray \ before -
This commit is contained in:
parent
dfed0236b8
commit
01137a1366
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user