From 23e03a1ee1d560b852f842d935310d7a36d39d6b Mon Sep 17 00:00:00 2001
From: Steffy Fort <steffyfort@gmail.com>
Date: Wed, 20 Mar 2024 22:54:55 +0100
Subject: [PATCH] Fix: Remove egrep for grep -E (#680)
Co-authored-by: Steffy Fort <steffy.fort@cozycloud.cc>
---
discourse-doctor | 2 +-
discourse-setup | 4 ++--
launcher | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/discourse-doctor b/discourse-doctor
index cf7d01c..9f89236 100755
--- a/discourse-doctor
+++ b/discourse-doctor
@@ -209,7 +209,7 @@ dump_yaml() {
## read a variable from the config file and stick it in read_config_result
##
read_config() {
- config_line=$(egrep "^ #?$1:" $web_file)
+ config_line=$(grep -E "^ #?$1:" $web_file)
read_config_result=$(echo $config_line | awk -F ":" '{print $2}')
read_config_result=$(echo $read_config_result | sed "s/^\([\"']\)\(.*\)\1\$/\2/g")
}
diff --git a/discourse-setup b/discourse-setup
index d90002c..d279949 100755
--- a/discourse-setup
+++ b/discourse-setup
@@ -343,13 +343,13 @@ check_port() {
## read a variable from the config file
##
read_config() {
- config_line=`egrep "^ #?$1:" $web_file`
+ config_line=`grep -E "^ #?$1:" $web_file`
read_config_result=`echo $config_line | awk -F":" '{print $2}'`
read_config_result=`echo $read_config_result | sed "s/^\([\"']\)\(.*\)\1\$/\2/g"`
}
read_default() {
- config_line=`egrep "^ #?$1:" samples/standalone.yml`
+ config_line=`grep -E "^ #?$1:" samples/standalone.yml`
read_default_result=`echo $config_line | awk -F":" '{print $2}'`
read_default_result=`echo $read_config_result | sed "s/^\([\"']\)\(.*\)\1\$/\2/g"`
}
diff --git a/launcher b/launcher
index 4708aa7..0eb264f 100755
--- a/launcher
+++ b/launcher
@@ -173,7 +173,7 @@ check_prereqs() {
fi
# 2. running an approved storage driver?
- if ! $docker_path info 2> /dev/null | egrep -q 'Storage Driver: (btrfs|aufs|zfs|overlay2)$'; then
+ if ! $docker_path info 2> /dev/null | grep -E -q 'Storage Driver: (btrfs|aufs|zfs|overlay2)$'; then
echo "Your Docker installation is not using a supported storage driver. If we were to proceed you may have a broken install."
echo "overlay2 is the recommended storage driver, although zfs and aufs may work as well."
echo "Other storage drivers are known to be problematic."