Accepting request 1001140 from home:AndreasStieger:branches:network
- convert usage of egrep to grep -E (boo#1203092) OBS-URL: https://build.opensuse.org/request/show/1001140 OBS-URL: https://build.opensuse.org/package/show/network/rp-pppoe?expand=0&rev=35
This commit is contained in:
parent
2561305946
commit
a14462b49d
@ -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
|
||||
|
@ -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 ""
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 4 17:53:20 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
||||
- convert usage of egrep to grep -E (boo#1203092)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 10 13:47:22 UTC 2022 - Илья Индиго <ilya@ilya.cf>
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package rp-pppoe
|
||||
# spec file
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
@ -43,9 +43,9 @@ Patch7: %{name}-3.14-strip.patch
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: ppp
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
Requires: group(%{_group})
|
||||
Requires: iproute2
|
||||
Requires: ppp
|
||||
Requires: group(%{_group})
|
||||
Requires(post): permissions
|
||||
Requires(pre): group(%{_group})
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user