diff --git a/bin/mktmpdir b/bin/mktmpdir index 758c4c75..161b617d 100755 --- a/bin/mktmpdir +++ b/bin/mktmpdir @@ -44,7 +44,7 @@ contemplate_dirs() # hasher emits no meaningful errors regarding those, sigh check_options() { - ! egrep -q "^$1 $2 .*no(dev|exec)" /proc/mounts + ! grep -E -q "^$1 $2 .*no(dev|exec)" /proc/mounts } # pick existing, writeable, >256M free space dirs diff --git a/bin/tags2lists b/bin/tags2lists index ad478776..35737cfa 100755 --- a/bin/tags2lists +++ b/bin/tags2lists @@ -33,4 +33,4 @@ transformed="$(sed \ [ -z "$transformed" ] || find $transformed \ | sed 's,^\./,,' \ - | egrep -v '(\.sw.|~)$' + | grep -E -v '(\.sw.|~)$' diff --git a/features.in/lowmem/install2/image-scripts.d/85-cleanup-lowmem b/features.in/lowmem/install2/image-scripts.d/85-cleanup-lowmem index 0b472483..f0577eb5 100755 --- a/features.in/lowmem/install2/image-scripts.d/85-cleanup-lowmem +++ b/features.in/lowmem/install2/image-scripts.d/85-cleanup-lowmem @@ -19,7 +19,7 @@ cd /usr/share/X11/locale && # xkb; don't drop "pc" yet cd /usr/share/X11/xkb/symbols && ls \ - | egrep -v 'by|en|kz|pt|ru|ua|us|pc|....*' \ + | grep -E -v 'by|en|kz|pt|ru|ua|us|pc|....*' \ | xargs rm -rf -- # gconv @@ -30,7 +30,7 @@ cd /usr/lib*/gconv && for dir in /usr/{lib*,share}/locale; do cd "$dir" && \ ls \ - | egrep -v '^be|en|kk|pt|ru|uk' \ + | grep -E -v '^be|en|kk|pt|ru|uk' \ | xargs rm -rf --; done diff --git a/features.in/services/install2/image-scripts.d/10-services b/features.in/services/install2/image-scripts.d/10-services index e6ac1f0c..7a3fb059 100755 --- a/features.in/services/install2/image-scripts.d/10-services +++ b/features.in/services/install2/image-scripts.d/10-services @@ -19,7 +19,7 @@ switch() { sname="${sname%.socket}" [ -n "$CHECK_FILES" ] && \ - egrep -qs "^[[:blank:]]*$sname(.service|.socket)?[[:blank:]]*$" \ + grep -E -qs "^[[:blank:]]*$sname(.service|.socket)?[[:blank:]]*$" \ $CHECK_FILES && return ||: # avoid service duplication: drop sevice without unit type diff --git a/features.in/x11-autologin/rootfs/image-scripts.d/40-x11-autologin b/features.in/x11-autologin/rootfs/image-scripts.d/40-x11-autologin index 1853f57c..553cb6b2 100755 --- a/features.in/x11-autologin/rootfs/image-scripts.d/40-x11-autologin +++ b/features.in/x11-autologin/rootfs/image-scripts.d/40-x11-autologin @@ -11,7 +11,7 @@ USER=altlinux add_nopasswdlogin_group() { [ -f "/etc/pam.d/$1" ] && - egrep -qs '^auth.+user[[:blank:]]+ingroup[[:blank:]]+nopasswdlogin' "/etc/pam.d/$1" && + grep -E -qs '^auth.+user[[:blank:]]+ingroup[[:blank:]]+nopasswdlogin' "/etc/pam.d/$1" && groupadd -r nopasswdlogin && gpasswd -a "$USER" nopasswdlogin } diff --git a/lib/build.mk b/lib/build.mk index 1ea248b4..0acf4d83 100644 --- a/lib/build.mk +++ b/lib/build.mk @@ -115,7 +115,7 @@ build-image: profile/populate fi; \ tail -n $(MAX_LINES) "$(BUILDLOG)" \ | GREP_COLOR="$(ANSI_FAIL)" \ - egrep --color=auto -m "$(MAX_ERRORS)" "$(GOTCHA)"; \ + grep -E --color=auto -m "$(MAX_ERRORS)" "$(GOTCHA)"; \ df -P $(BUILDDIR) | awk 'END { if ($$4 < $(LOWSPACE)) \ { print "NB: low space on "$$6" ("$$5" used)"}}'; \ fi; \ diff --git a/lib/profile.mk b/lib/profile.mk index 4f984773..84eba2e9 100644 --- a/lib/profile.mk +++ b/lib/profile.mk @@ -56,7 +56,7 @@ profile/init: distclean SOURCELIST Dir::Etc::sourcelist/f \ SOURCEPARTS Dir::Etc::sourceparts/d`; \ find "$$SOURCEPARTS" -mindepth 1 -maxdepth 1 -name '*.list' \ - | xargs egrep -hv -e '^#|^[[:blank:]]*$$' -- "$$SOURCELIST" \ + | xargs grep -E -hv -e '^#|^[[:blank:]]*$$' -- "$$SOURCELIST" \ | tee $(BUILDDIR)/sources.list; \ echo; \ } $(LOG); \