Unify grep usage

Signed-off-by: Thomas Deutschmann <[email protected]>

Author: Whissi

Makefile

@@ -1,4 +1,4 @@
-#PACKAGE_VERSION = $(shell /bin/fgrep GK_V= genkernel | sed "s/.*GK_V='\([^']\+\)'/\1/")
+#PACKAGE_VERSION = $(shell /bin/grep -F -- GK_V= genkernel | sed "s/.*GK_V='\([^']\+\)'/\1/")
 PACKAGE_VERSION = $(shell git describe --tags |sed 's,^v,,g')
 distdir = genkernel-$(PACKAGE_VERSION)
 MANPAGE = genkernel.8
@@ -78,7 +78,7 @@ verify-doc: doc/genkernel.8.txt
 			-e '/ssh-host-keys/s,=\(create\|create-from-host\|runtime\),,g' | \
 		while read opt ; do \
 			regex="^*--(...no-...)?$$opt" ; \
-			if ! egrep -e "$$regex" $< -sq ; then \
+			if ! grep -Ee "$$regex" $< -sq ; then \
 				touch faildoc ; \
 				echo "Undocumented option: $$opt" ; \
 			fi ; \

defaults/initrd.scripts

@@ -1023,7 +1023,7 @@ run_shell() {
 
 fs_type_in_use() {
 	fs_type=$1
-	cut -d ' ' -f 3 < /proc/mounts | fgrep -q "${fs_type}"
+	cut -d ' ' -f 3 < /proc/mounts | grep -Fq "${fs_type}"
 }
 
 mount_devfs() {

defaults/linuxrc

@@ -1062,7 +1062,7 @@ then
 					bad_msg "Squashfs filesystem could not be mounted, dropping into shell."
 					if [ -e /proc/filesystems ]
 					then
-						fgrep -q squashfs /proc/filesystems || \
+						grep -Fq squashfs /proc/filesystems || \
 							bad_msg "HINT: Your kernel does not know filesystem \"squashfs\"."
 					fi
 					run_shell
@@ -1279,7 +1279,7 @@ do
 	# and not a mountpoint
 	[ -z "${dev}" ] && continue
 	fstype=$(get_mount_fstype ${fs})
-	if get_mount_options ${fs} | fgrep -q bind
+	if get_mount_options ${fs} | grep -Fq bind
 	then
 		opts='bind'
 		dev=${NEW_ROOT}${dev}

gen_determineargs.sh

@@ -606,7 +606,7 @@ determine_real_args() {
 	vars_to_initialize+=( "BUSYBOX_CONFIG" )
 	vars_to_initialize+=( "DEFAULT_KERNEL_CONFIG" )
 
-	local binpkgs=( $(compgen -A variable |grep '^GKPKG_.*_BINPKG$') )
+	local binpkgs=( $(compgen -A variable | grep '^GKPKG_.*_BINPKG$') )
 	local binpkg
 	for binpkg in "${binpkgs[@]}"
 	do
@@ -639,7 +639,7 @@ determine_real_args() {
 	declare -gA GKICM_LOOKUP_TABLE_PKG=()
 	local known_initramfs_compression_methods_by_compression=( $(get_initramfs_compression_method_by_compression) )
 	local known_initramfs_compression_methods_by_speed=( $(get_initramfs_compression_method_by_speed) )
-	local initramfs_compression_methods=( $(compgen -A variable |grep '^GKICM_.*_KOPTNAME$') )
+	local initramfs_compression_methods=( $(compgen -A variable | grep '^GKICM_.*_KOPTNAME$') )
 	local initramfs_compression_method key var_name var_prefix
 	for initramfs_compression_method in "${initramfs_compression_methods[@]}"
 	do

gen_funcs.sh

@@ -1908,7 +1908,7 @@ check_disk_space_requirements() {
 }
 
 check_distfiles() {
-	local source_files=( $(compgen -A variable |grep '^GKPKG_.*_SRCTAR$') )
+	local source_files=( $(compgen -A variable | grep '^GKPKG_.*_SRCTAR$') )
 
 	local -a missing_sources
 	local source_file=
@@ -2046,7 +2046,7 @@ make_bootdir_writable() {
 	local bootdir_status=unknown
 
 	# Based on mount-boot.eclass code
-	local fstabstate=$(awk "!/^#|^[[:blank:]]+#|^${BOOTDIR//\//\\/}/ {print \$2}" /etc/fstab 2>/dev/null | egrep "^${BOOTDIR}$" )
+	local fstabstate=$(awk "!/^#|^[[:blank:]]+#|^${BOOTDIR//\//\\/}/ {print \$2}" /etc/fstab 2>/dev/null | grep -E "^${BOOTDIR}$" )
 	local procstate=$(awk "\$2 ~ /^${BOOTDIR//\//\\/}\$/ {print \$2}" /proc/mounts 2>/dev/null)
 	local proc_ro=$(awk '{ print $2 " ," $4 "," }' /proc/mounts 2>/dev/null | sed -n "/^${BOOTDIR//\//\\/} .*,ro,/p")
 

gen_initramfs.sh

@@ -37,7 +37,7 @@ copy_binaries() {
 		[[ -e "${binary}" ]] \
 			|| gen_die "Binary ${binary} could not be found"
 
-		if LC_ALL=C "${LDDTREE_COMMAND}" "${binary}" 2>&1 | fgrep -q 'not found'
+		if LC_ALL=C "${LDDTREE_COMMAND}" "${binary}" 2>&1 | grep -F -q 'not found'
 		then
 			gen_die "Binary ${binary} is linked to missing libraries and may need to be re-built"
 		fi