diff options
| author | Andrei Pavel <andrei@isc.org> | 2023-05-19 08:00:43 +0200 |
|---|---|---|
| committer | Andrei Pavel <andrei@isc.org> | 2023-05-19 08:00:43 +0200 |
| commit | 01137a1366f58302e2895006c071f0682f23a2ae (patch) | |
| tree | 7e1815062bd6082bb0c2b3df4cb8ec907b6fb14a /tools | |
| parent | [#2859] expanded leaseX-write ARM text (diff) | |
| download | kea-01137a1366f58302e2895006c071f0682f23a2ae.tar.xz kea-01137a1366f58302e2895006c071f0682f23a2ae.zip | |
[#2786] fix grep: warning: stray \ before -
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/bump-lib-versions.sh | 4 | ||||
| -rwxr-xr-x | tools/check-for-duplicate-includes.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/bump-lib-versions.sh b/tools/bump-lib-versions.sh index fad6fb235c..b21becf24d 100755 --- 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 31d6beff2f..8f13b31af3 100755 --- 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 |