control: tag -1 patch
Here's a quick patch to get rid of the egrep warnings.
Cheers,
-Hilko
From: Hilko Bengen <ben...@debian.org>
Date: Wed, 7 Sep 2022 09:41:29 +0200
Subject: Replace egrep with grep -E
---
etc/setup.d/05file | 12 ++++++------
etc/setup.d/15killprocs | 2 +-
etc/setup.d/20copyfiles | 2 +-
etc/setup.d/20nssdatabases | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/etc/setup.d/05file b/etc/setup.d/05file
index 1afbeed..46a0951 100755
--- a/etc/setup.d/05file
+++ b/etc/setup.d/05file
@@ -28,17 +28,17 @@ check_filetype()
{
if echo "$CHROOT_FILE" | grep -q '\.tar$'; then
filetype="tar"
- elif echo "$CHROOT_FILE" | egrep -q '(\.tar\.gz|\.tgz)$'; then
+ elif echo "$CHROOT_FILE" | grep -E -q '(\.tar\.gz|\.tgz)$'; then
filetype="tgz"
- elif echo "$CHROOT_FILE" | egrep -q '(\.tar\.bz2|\.tbz)$'; then
+ elif echo "$CHROOT_FILE" | grep -E -q '(\.tar\.bz2|\.tbz)$'; then
filetype="tbz"
- elif echo "$CHROOT_FILE" | egrep -q '(\.tar\.xz|\.txz)$'; then
+ elif echo "$CHROOT_FILE" | grep -E -q '(\.tar\.xz|\.txz)$'; then
filetype="txz"
- elif echo "$CHROOT_FILE" | egrep -q '(\.tar\.lzo|\.tzo)$'; then
+ elif echo "$CHROOT_FILE" | grep -E -q '(\.tar\.lzo|\.tzo)$'; then
filetype="tzo"
- elif echo "$CHROOT_FILE" | egrep -q '(\.tar\.lz4|\.tlz4)$'; then
+ elif echo "$CHROOT_FILE" | grep -E -q '(\.tar\.lz4|\.tlz4)$'; then
filetype="tlz4"
- elif echo "$CHROOT_FILE" | egrep -q '\.tar\.zstd$'; then
+ elif echo "$CHROOT_FILE" | grep -E -q '\.tar\.zstd$'; then
filetype="tzstd"
else
fatal "Unsupported filetype for $CHROOT_FILE"
diff --git a/etc/setup.d/15killprocs b/etc/setup.d/15killprocs
index 630fb10..331b693 100755
--- a/etc/setup.d/15killprocs
+++ b/etc/setup.d/15killprocs
@@ -45,7 +45,7 @@ do_kill_all()
fi
info "Killing processes run inside $1"
- ls /proc | egrep '^[[:digit:]]+$' |
+ ls /proc | grep -E '^[[:digit:]]+$' |
while read pid; do
# Check if process root are the same device/inode as chroot
# root (for efficiency)
diff --git a/etc/setup.d/20copyfiles b/etc/setup.d/20copyfiles
index c9788cc..ebdf7d3 100755
--- a/etc/setup.d/20copyfiles
+++ b/etc/setup.d/20copyfiles
@@ -80,7 +80,7 @@ if [ $STAGE = "setup-start" ] || [ $STAGE = "setup-recover" ]; then
if [ -n "$SETUP_COPYFILES" ]; then
if [ -f "$SETUP_COPYFILES" ]; then
while read file; do
- if echo "$file" | egrep -q '^(#|$)' ; then
+ if echo "$file" | grep -E -q '^(#|$)' ; then
continue
fi
if echo "$file" | grep -q '^/'; then
diff --git a/etc/setup.d/20nssdatabases b/etc/setup.d/20nssdatabases
index cd6afab..ff79ffb 100755
--- a/etc/setup.d/20nssdatabases
+++ b/etc/setup.d/20nssdatabases
@@ -37,7 +37,7 @@ if [ $STAGE = "setup-start" ] || [ $STAGE = "setup-recover" ]; then
if [ -n "$SETUP_NSSDATABASES" ]; then
if [ -f "$SETUP_NSSDATABASES" ]; then
while read db; do
- if echo "$db" | egrep -q '^(#|$)' ; then
+ if echo "$db" | grep -E -q '^(#|$)' ; then
continue
fi
