diff --git a/schroot/setup.d/05file b/schroot/setup.d/05file index 921a7e2..334a539 100755 --- a/schroot/setup.d/05file +++ b/schroot/setup.d/05file @@ -28,15 +28,15 @@ 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" else fatal "Unsupported filetype for $CHROOT_FILE" diff --git a/schroot/setup.d/15killprocs b/schroot/setup.d/15killprocs index a37c455..907a983 100755 --- a/schroot/setup.d/15killprocs +++ b/schroot/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/schroot/setup.d/20copyfiles b/schroot/setup.d/20copyfiles index 2c01af9..7233c14 100755 --- a/schroot/setup.d/20copyfiles +++ b/schroot/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/schroot/setup.d/20nssdatabases b/schroot/setup.d/20nssdatabases index 6ea83c0..c3e3bbc 100755 --- a/schroot/setup.d/20nssdatabases +++ b/schroot/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