diff options
Diffstat (limited to 'source/ap')
| -rw-r--r-- | source/ap/slackpkg/files/core-functions.sh | 4 | ||||
| -rw-r--r-- | source/ap/slackpkg/files/slackpkg | 2 | ||||
| -rwxr-xr-x | source/ap/slackpkg/slackpkg.SlackBuild | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/ap/slackpkg/files/core-functions.sh b/source/ap/slackpkg/files/core-functions.sh index 56314e990..824547867 100644 --- a/source/ap/slackpkg/files/core-functions.sh +++ b/source/ap/slackpkg/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 @@ -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/source/ap/slackpkg/files/slackpkg b/source/ap/slackpkg/files/slackpkg index 9fc7f5d4e..cc95bb08f 100644 --- a/source/ap/slackpkg/files/slackpkg +++ b/source/ap/slackpkg/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 diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild index 4f630c485..78c1ab0d9 100755 --- a/source/ap/slackpkg/slackpkg.SlackBuild +++ b/source/ap/slackpkg/slackpkg.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=slackpkg VERSION=${VERSION:-15.0.10} ARCH="noarch" -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information |