From efd23c6ca3dacb090825577ef7fe35d065406f9c Mon Sep 17 00:00:00 2001 From: shamilbi Date: Mon, 5 Sep 2022 16:22:59 +0200 Subject: [PATCH 1/3] 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 --- files/core-functions.sh | 2 +- files/slackpkg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/files/core-functions.sh b/files/core-functions.sh index 56314e9..6877db1 100644 --- a/files/core-functions.sh +++ b/files/core-functions.sh @@ -1276,7 +1276,7 @@ function sanity_check() { [ "$SPINNING" = "off" ] || spinning ${TMPDIR}/waiting & 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 }') mv $ROOT/var/log/packages/${i} $ROOT/var/log/packages/${REVNAME} mv $ROOT/var/log/scripts/${i} $ROOT/var/log/scripts/${REVNAME} diff --git a/files/slackpkg b/files/slackpkg index 9fc7f5d..cc95bb0 100644 --- a/files/slackpkg +++ b/files/slackpkg @@ -222,7 +222,7 @@ while [ -n "$1" ] ; do CMD=$1 shift if [ -n "$1" ]; then - if echo $1 | egrep -q "^\.{0,2}/" ; then + if echo $1 | grep -Eq "^\.{0,2}/" ; then if [ -e $1 ]; then INPUTLIST=$(cat $1 | tr "\n" " ") else From a278359a9a65ddadd024b433afd0d7a465696475 Mon Sep 17 00:00:00 2001 From: shamilbi Date: Thu, 8 Sep 2022 21:23:46 +0200 Subject: [PATCH 2/3] fix: grep warning: stray \ before / --- files/core-functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/core-functions.sh b/files/core-functions.sh index 6877db1..8245478 100644 --- a/files/core-functions.sh +++ b/files/core-functions.sh @@ -639,7 +639,7 @@ function mkregex_blacklist() { s,^, , s,$, , s,^ (extra|pasture|patches|slackware(|64)|testing)/ $,^\1 , - s,^ ([^/]+)/ $, \\\.\\\/$PKGMAIN\\\/\1\$, + s,^ ([^/]+)/ $, \\\./$PKGMAIN/\1\$, " ${CONF}/blacklist > ${TMPDIR}/blacklist.tmp # Filter server and local package lists through blacklist From c785cce8a85717d1b1539b22f84607a613c1ea77 Mon Sep 17 00:00:00 2001 From: shamilbi Date: Wed, 14 Sep 2022 16:24:48 +0200 Subject: [PATCH 3/3] +.gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1944fd6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.tmp