diff --git a/pppoe-connect b/pppoe-connect index 9b69eee..240a8ff 100644 --- a/pppoe-connect +++ b/pppoe-connect @@ -43,8 +43,8 @@ get_device() { fi cd $NETWORKDIR - interfaces=$($LS ifcfg-ppp* 2>/dev/null | egrep -v '(~|\.bak)$' | \ - egrep -v '(rpmsave|rpmorig|rpmnew)' | sed 's/^ifcfg-//g') + interfaces=$($LS ifcfg-ppp* 2>/dev/null | grep -E -v '(~|\.bak)$' | \ + grep -E -v '(rpmsave|rpmorig|rpmnew)' | sed 's/^ifcfg-//g') for i in $interfaces ; do test -f ifcfg-$i && . ifcfg-$i 2>/dev/null diff --git a/pppoe-setup b/pppoe-setup index 57e8bd3..b8deb00 100644 --- a/pppoe-setup +++ b/pppoe-setup @@ -46,8 +46,8 @@ get_device() { fi cd $NETWORKDIR - interfaces=$($LS ifcfg-ppp* 2>/dev/null | egrep -v '(~|\.bak)$' | \ - egrep -v '(rpmsave|rpmorig|rpmnew)' | sed 's/^ifcfg-//g') + interfaces=$($LS ifcfg-ppp* 2>/dev/null | grep -E -v '(~|\.bak)$' | \ + grep -E -v '(rpmsave|rpmorig|rpmnew)' | sed 's/^ifcfg-//g') for i in $interfaces ; do test -f ifcfg-$i && . ifcfg-$i 2>/dev/null @@ -466,9 +466,9 @@ else cp /dev/null $CHAPFILE.bak fi -egrep -v "^$USER|^\"$USER\"" $PAPFILE.bak > $PAPFILE +grep -E -v "^$USER|^\"$USER\"" $PAPFILE.bak > $PAPFILE $ECHO "\"$USER\" * \"$PWD1\"" >> $PAPFILE -egrep -v "^$USER|^\"$USER\"" $CHAPFILE.bak > $CHAPFILE +grep -E -v "^$USER|^\"$USER\"" $CHAPFILE.bak > $CHAPFILE $ECHO "\"$USER\" * \"$PWD1\"" >> $CHAPFILE $ECHO "" diff --git a/pppoe-start b/pppoe-start index 35b298a..349e2c6 100644 --- a/pppoe-start +++ b/pppoe-start @@ -40,8 +40,8 @@ get_device() { fi cd $NETWORKDIR - interfaces=$($LS ifcfg-ppp* 2>/dev/null | egrep -v '(~|\.bak)$' | \ - egrep -v '(rpmsave|rpmorig|rpmnew)' | sed 's/^ifcfg-//g') + interfaces=$($LS ifcfg-ppp* 2>/dev/null | grep -E -v '(~|\.bak)$' | \ + grep -E -v '(rpmsave|rpmorig|rpmnew)' | sed 's/^ifcfg-//g') for i in $interfaces ; do test -f ifcfg-$i && . ifcfg-$i 2>/dev/null diff --git a/pppoe-status b/pppoe-status index a55eec9..f401854 100644 --- a/pppoe-status +++ b/pppoe-status @@ -32,8 +32,8 @@ get_device() { fi cd $NETWORKDIR - interfaces=$($LS ifcfg-ppp* 2>/dev/null | egrep -v '(~|\.bak)$' | \ - egrep -v '(rpmsave|rpmorig|rpmnew)' | sed 's/^ifcfg-//g') + interfaces=$($LS ifcfg-ppp* 2>/dev/null | grep -E -v '(~|\.bak)$' | \ + grep -E -v '(rpmsave|rpmorig|rpmnew)' | sed 's/^ifcfg-//g') for i in $interfaces ; do test -f ifcfg-$i && . ifcfg-$i 2>/dev/null diff --git a/pppoe-stop b/pppoe-stop index 4c73a61..6788809 100644 --- a/pppoe-stop +++ b/pppoe-stop @@ -38,8 +38,8 @@ get_device() { fi cd $NETWORKDIR - interfaces=$($LS ifcfg-ppp* 2>/dev/null | egrep -v '(~|\.bak)$' | \ - egrep -v '(rpmsave|rpmorig|rpmnew)' | sed 's/^ifcfg-//g') + interfaces=$($LS ifcfg-ppp* 2>/dev/null | grep -E -v '(~|\.bak)$' | \ + grep -E -v '(rpmsave|rpmorig|rpmnew)' | sed 's/^ifcfg-//g') for i in $interfaces ; do test -f ifcfg-$i && . ifcfg-$i 2>/dev/null diff --git a/rp-pppoe.changes b/rp-pppoe.changes index 40166b3..f8b22f2 100644 --- a/rp-pppoe.changes +++ b/rp-pppoe.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Sep 4 17:53:20 UTC 2022 - Andreas Stieger + +- Converted usage of egrep to "grep -E" (boo#1203092). + ------------------------------------------------------------------- Thu Mar 10 13:47:22 UTC 2022 - Илья Индиго