github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-08-11 11:22:05 +00:00
Code Issues Projects Releases Wiki Activity

Replace egrep with grep -E

Browse Source 
This should silence any `egrep is obsolescent; using grep -E` warnings.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
Lokesh Mandvekar 2024-08-16 09:07:58 -04:00
parent f64a376157
commit d38276137e
No known key found for this signature in database
GPG Key ID: 1C1EDD7CC7C3A0DD
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/get_fqin.sh
View File

@ -29,6 +29,6 @@ $CONTAINER_RUNTIME run --rm \
--entrypoint=/usr/share/automation/bin/cirrus-ci_env.py \ --entrypoint=/usr/share/automation/bin/cirrus-ci_env.py \
quay.io/libpod/get_ci_vm:latest \ quay.io/libpod/get_ci_vm:latest \
--envs="Skopeo Test" /src/.cirrus.yml | \ --envs="Skopeo Test" /src/.cirrus.yml | \
egrep -m1 '^SKOPEO_CIDEV_CONTAINER_FQIN' | \ grep -E -m1 '^SKOPEO_CIDEV_CONTAINER_FQIN' | \
awk -F "=" -e '{print $2}' | \ awk -F "=" -e '{print $2}' | \
tr -d \'\" tr -d \'\"

6
hack/man-page-checker
View File

@ -29,7 +29,7 @@ rc=0
# for a given skopeo-foo.1.md, the NAME should be 'skopeo-foo' # for a given skopeo-foo.1.md, the NAME should be 'skopeo-foo'
for md in *.1.md;do for md in *.1.md;do
# Read the first line after '## NAME' # Read the first line after '## NAME'
name=$(egrep -A1 '^## NAME' $md|tail -1|awk '{print $1}' | tr -d \\\\) name=$(grep -E -A1 '^## NAME' $md|tail -1|awk '{print $1}' | tr -d \\\\)
expect=$(basename $md .1.md) expect=$(basename $md .1.md)
if [ "$name" != "$expect" ]; then if [ "$name" != "$expect" ]; then
@ -45,7 +45,7 @@ done
# Make sure the descriptive text in skopeo-foo.1.md matches the one # Make sure the descriptive text in skopeo-foo.1.md matches the one
# in the table in skopeo.1.md. # in the table in skopeo.1.md.
for md in $(ls -1 *-*.1.md);do for md in $(ls -1 *-*.1.md);do
desc=$(egrep -A1 '^## NAME' $md|tail -1|sed -E -e 's/^skopeo[^[:space:]]+ - //') desc=$(grep -E -A1 '^## NAME' $md|tail -1|sed -E -e 's/^skopeo[^[:space:]]+ - //')
# Find the descriptive text in the main skopeo man page. # Find the descriptive text in the main skopeo man page.
parent=skopeo.1.md parent=skopeo.1.md
@ -112,7 +112,7 @@ function compare_usage() {
# #
# Make sure the SYNOPSIS line in skopeo-foo.1.md reads '**skopeo foo** ...' # Make sure the SYNOPSIS line in skopeo-foo.1.md reads '**skopeo foo** ...'
for md in *.1.md;do for md in *.1.md;do
synopsis=$(egrep -A1 '^#* SYNOPSIS' $md|tail -1) synopsis=$(grep -E -A1 '^#* SYNOPSIS' $md|tail -1)
# Command name must be bracketed by double asterisks; options and # Command name must be bracketed by double asterisks; options and
# arguments are bracketed by single ones. # arguments are bracketed by single ones.

2
systemtest/010-inspect.bats
View File

@ -36,7 +36,7 @@ load helpers
# the output of 'inspect' lists layer digests, # the output of 'inspect' lists layer digests,
# but not the digest of the config blob ($config_digest), if any. # but not the digest of the config blob ($config_digest), if any.
layers=$(jq -r '.Layers' <<<"$inspect_local") layers=$(jq -r '.Layers' <<<"$inspect_local")
for sha in $(find $workdir -type f | xargs -l1 basename | egrep '^[0-9a-f]{64}$'); do for sha in $(find $workdir -type f | xargs -l1 basename | grep -E '^[0-9a-f]{64}$'); do
if [ "sha256:$sha" != "$config_digest" ]; then if [ "sha256:$sha" != "$config_digest" ]; then
expect_output --from="$layers" --substring "sha256:$sha" \ expect_output --from="$layers" --substring "sha256:$sha" \
"Locally-extracted SHA file is present in 'inspect'" "Locally-extracted SHA file is present in 'inspect'"

2
systemtest/helpers.bash
View File

@ -317,7 +317,7 @@ start_registry() {
die "start_registry() invoked with testuser but no testpassword" die "start_registry() invoked with testuser but no testpassword"
fi fi
if ! egrep -q "^$testuser:" $AUTHDIR/htpasswd; then if ! grep -E -q "^$testuser:" $AUTHDIR/htpasswd; then
htpasswd -Bbn $testuser $testpassword >> $AUTHDIR/htpasswd htpasswd -Bbn $testuser $testpassword >> $AUTHDIR/htpasswd
fi fi