From b331022520cd502ef314e329d573695768244366 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Wed, 20 Oct 2021 21:02:11 -0600
Subject: [PATCH] Replace fgrep usage with grep -F

---
 setup/build_macos                                 | 4 ++--
 setup/linux/profile_gui/airootfs/etc/skel/.zlogin | 2 +-
 setup/macos/live-macos-startup                    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup/build_macos b/setup/build_macos
index 55bdc127..fda0b8b4 100755
--- a/setup/build_macos
+++ b/setup/build_macos
@@ -38,7 +38,7 @@ IMAGE_DEV="$(hdiutil attach -mountpoint /Volumes/BaseSystem "${BASE_IMAGE}" -nob
 OS_NAME="$(ls /Volumes/BaseSystem | grep -E 'OS X|macOS' | sed -E 's/Install (OS X|macOS) (.*)\.app/\2/')"
 OS_VERSION="$(defaults read /Volumes/BaseSystem/System/Library/CoreServices/SystemVersion ProductVersion)"
 OUT_NAME="${HOME}/Desktop/WK ${OS_NAME} ($(date +"%Y-%m-%d"))"
-TIMEZONE="$(fgrep LINUX_TIME_ZONE "${ROOT_DIR}/scripts/wk/cfg/main.py" | cut -d '=' -f 2 | sed "s/'//g")"
+TIMEZONE="$(grep -F LINUX_TIME_ZONE "${ROOT_DIR}/scripts/wk/cfg/main.py" | cut -d '=' -f 2 | sed "s/'//g")"
 WK_PATH="/Volumes/1201_UFD"
 
 # Convert to a 4 GB R/W image
@@ -129,7 +129,7 @@ cp -a "${MACOS_DIR}/aliases" "${WK_PATH}/.aliases"
 cp -a "${MACOS_DIR}/bashrc" "${WK_PATH}/etc/profile"
 cp -a "${MACOS_DIR}/vimrc" "${WK_PATH}/.vimrc"
 if [[ "${OS_VERSION:3:2}" == "11" ]]; then
-  cp -a /usr/bin/fgrep "${WK_PATH}/usr/bin"/
+  cp -a /usr/bin/grep -F "${WK_PATH}/usr/bin"/
   cp -a /usr/bin/locale "${WK_PATH}/usr/bin"/
   rsync -aS /usr/share/locale/ "${WK_PATH}/usr/share/locale"/
 elif [[ "${OS_VERSION:3:2}" == "13" ]]; then
diff --git a/setup/linux/profile_gui/airootfs/etc/skel/.zlogin b/setup/linux/profile_gui/airootfs/etc/skel/.zlogin
index 6a7dca22..f72bb908 100644
--- a/setup/linux/profile_gui/airootfs/etc/skel/.zlogin
+++ b/setup/linux/profile_gui/airootfs/etc/skel/.zlogin
@@ -4,7 +4,7 @@ if [ "$(fgconsole 2>/dev/null)" -eq "1" ]; then
     "${HOME}/.update_network"
 
     # Start X or HW-diags
-    if ! fgrep -q "nox" /proc/cmdline; then
+    if ! grep -Fq "nox" /proc/cmdline; then
         # Show freeze warning
         echo ""
         echo "NOTE: Not all GPUs/displays are supported."
diff --git a/setup/macos/live-macos-startup b/setup/macos/live-macos-startup
index db939bdf..9702ecf8 100755
--- a/setup/macos/live-macos-startup
+++ b/setup/macos/live-macos-startup
@@ -20,7 +20,7 @@ cd /Volumes/RAM_Disk
 
 # Connect to WiFi?
 if ! [[ -e /Volumes/RAM_Disk/.wifi ]]; then
-  WIFI_NET="$(fgrep ':::' /.known_networks | head -1)"
+  WIFI_NET="$(grep -F ':::' /.known_networks | head -1)"
   if ! ifconfig | grep -Eq '(((10|172)\.\d+|192.168)\.\d+\.\d+)' 2>/dev/null; then
     echo "Connecting to WiFi..."
     NET_DEV="$(/usr/sbin/networksetup \