Fix: Remove egrep for grep -E ()

Co-authored-by: Steffy Fort <steffy.fort@cozycloud.cc>
This commit is contained in:
Steffy Fort 2024-03-20 22:54:55 +01:00 committed by GitHub
parent e6ffa64d9d
commit 23e03a1ee1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions

View file

@ -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")
}

View file

@ -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"`
}

View file

@ -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."