mirror of
https://github.com/rworkman/slackpkg
synced 2024-12-25 21:58:42 +01:00
fix: egrep and fgrep commands have been deprecated since 2007
https://news.slashdot.org/story/22/09/05/0135254/ The egrep and fgrep commands have been deprecated since 2007. Beginning with GNU Grep 3.8 today, calling these commands will now issue a warning to the user that instead they should use grep -E and grep -F, respectively
This commit is contained in:
parent
b211490ee5
commit
efd23c6ca3
2 changed files with 2 additions and 2 deletions
|
@ -1276,7 +1276,7 @@ function sanity_check() {
|
||||||
[ "$SPINNING" = "off" ] || spinning ${TMPDIR}/waiting &
|
[ "$SPINNING" = "off" ] || spinning ${TMPDIR}/waiting &
|
||||||
|
|
||||||
for i in $(ls -1 $ROOT/var/log/packages/ | \
|
for i in $(ls -1 $ROOT/var/log/packages/ | \
|
||||||
egrep -- "^.*-(${ARCH}|fw|noarch)-[^-]+-upgraded"); do
|
grep -E -- "^.*-(${ARCH}|fw|noarch)-[^-]+-upgraded"); do
|
||||||
REVNAME=$(echo ${i} | awk -F'-upgraded' '{ print $1 }')
|
REVNAME=$(echo ${i} | awk -F'-upgraded' '{ print $1 }')
|
||||||
mv $ROOT/var/log/packages/${i} $ROOT/var/log/packages/${REVNAME}
|
mv $ROOT/var/log/packages/${i} $ROOT/var/log/packages/${REVNAME}
|
||||||
mv $ROOT/var/log/scripts/${i} $ROOT/var/log/scripts/${REVNAME}
|
mv $ROOT/var/log/scripts/${i} $ROOT/var/log/scripts/${REVNAME}
|
||||||
|
|
|
@ -222,7 +222,7 @@ while [ -n "$1" ] ; do
|
||||||
CMD=$1
|
CMD=$1
|
||||||
shift
|
shift
|
||||||
if [ -n "$1" ]; then
|
if [ -n "$1" ]; then
|
||||||
if echo $1 | egrep -q "^\.{0,2}/" ; then
|
if echo $1 | grep -Eq "^\.{0,2}/" ; then
|
||||||
if [ -e $1 ]; then
|
if [ -e $1 ]; then
|
||||||
INPUTLIST=$(cat $1 | tr "\n" " ")
|
INPUTLIST=$(cat $1 | tr "\n" " ")
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue