diff -Naur slackpkg.orig/usr/libexec/slackpkg/core-functions.sh slackpkg/usr/libexec/slackpkg/core-functions.sh --- slackpkg.orig/usr/libexec/slackpkg/core-functions.sh 2011-04-05 07:54:23.000000000 +0200 +++ slackpkg/usr/libexec/slackpkg/core-functions.sh 2013-02-10 08:16:55.586203612 +0100 @@ -549,9 +549,9 @@ grep -vE "(^#|^[[:blank:]]*$)" ${CONF}/blacklist > ${TMPDIR}/blacklist if echo $CMD | grep -q install ; then - ls -1 /var/log/packages/* | awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist + ls -1 $ROOT/var/log/packages/* | awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist else - ls -1 /var/log/packages/* | awk -f /usr/libexec/slackpkg/pkglist.awk | applyblacklist > ${TMPDIR}/tmplist + ls -1 $ROOT/var/log/packages/* | awk -f /usr/libexec/slackpkg/pkglist.awk | applyblacklist > ${TMPDIR}/tmplist fi cat ${WORKDIR}/pkglist | applyblacklist > ${TMPDIR}/pkglist @@ -763,7 +763,7 @@ # First is the package already installed? # Amazing what a little sleep will do # exclusion is so much nicer :) - INSTPKG=$(ls -1 /var/log/packages | \ + INSTPKG=$(ls -1 $ROOT/var/log/packages | \ grep -e "^${BASENAME}-[^-]\+-\(${ARCH}\|fw\|noarch\)-[^-]\+") # INSTPKG is local version @@ -1130,14 +1130,14 @@ [ "$SPINNING" = "off" ] || spinning ${TMPDIR}/waiting & - for i in $(ls -1 /var/log/packages | \ + for i in $(ls -1 $ROOT/var/log/packages | \ egrep -- "^.*-(${ARCH}|fw|noarch)-[^-]+-upgraded"); do REVNAME=$(echo ${i} | awk -F'-upgraded' '{ print $1 }') - mv /var/log/packages/${i} /var/log/packages/${REVNAME} - mv /var/log/scripts/${i} /var/log/scripts/${REVNAME} + mv $ROOT/var/log/packages/${i} $ROOT/var/log/packages/${REVNAME} + mv $ROOT/var/log/scripts/${i} $ROOT/var/log/scripts/${REVNAME} done - ls -1 /var/log/packages | egrep "^.*-(${ARCH}|fw|noarch)-[^-]+$" | \ + ls -1 $ROOT/var/log/packages | egrep "^.*-(${ARCH}|fw|noarch)-[^-]+$" | \ batchcutpkg | sort > $TMPDIR/list1 cat $TMPDIR/list1 | uniq > $TMPDIR/list2 FILES="$(diff $TMPDIR/list1 $TMPDIR/list2 | grep '<' | cut -f2 -d\ )" @@ -1154,12 +1154,12 @@ if [ "$DOUBLEFILES" != "" ]; then echo -e "\ -You have a broken /var/log/packages - with two versions of the same package.\n\ +You have a broken $ROOT/var/log/packages - with two versions of the same package.\n\ The list of packages duplicated in your machine are shown below, but don't\n\ worry about this list - when you select your action, slackpkg will show a\n\ better list:\n" for i in $DOUBLEFILES ; do - ls -1 /var/log/packages |\ + ls -1 $ROOT/var/log/packages |\ egrep -i -- "^${i}-[^-]+-(${ARCH}|fw|noarch)-" done echo -ne "\n\ @@ -1174,7 +1174,7 @@ ;; R|r) for i in $DOUBLEFILES ; do - FILE=$(ls -1 /var/log/packages |\ + FILE=$(ls -1 $ROOT/var/log/packages |\ egrep -i -- "^${i}-[^-]+-(${ARCH}|fw|noarch)-") FILES="$FILES $FILE" done @@ -1294,7 +1294,7 @@ touch $TMPDIR/waiting echo -e "\tGenerating slackware installed package list (this may take a while) \c" [ "$SPINNING" = "off" ] || spinning ${TMPDIR}/waiting & - for i in /var/log/packages/* ; do + for i in $ROOT/var/log/packages/* ; do PKGNAME=$( cutpkg $(basename $i)) grep -q " $PKGNAME " ${WORKDIR}/pkglist && \ echo $PKGNAME >> $TMPDIR/$TEMPLATE.work diff -Naur slackpkg.orig/usr/libexec/slackpkg/functions.d/dialog-functions.sh slackpkg/usr/libexec/slackpkg/functions.d/dialog-functions.sh --- slackpkg.orig/usr/libexec/slackpkg/functions.d/dialog-functions.sh 2010-05-02 01:10:33.000000000 +0200 +++ slackpkg/usr/libexec/slackpkg/functions.d/dialog-functions.sh 2013-02-10 08:17:39.883770621 +0100 @@ -20,7 +20,7 @@ rm -f $TMPDIR/dialog.tmp if [ "$2" = "upgrade" ]; then - ls -1 /var/log/packages > $TMPDIR/tmplist + ls -1 $ROOT/var/log/packages > $TMPDIR/tmplist for i in $1; do BASENAME=$(cutpkg $i) PKGFOUND=$(grep -m1 -e "^${BASENAME}-[^-]\+-\(noarch\|fw\|${ARCH}\)" $TMPDIR/tmplist) diff -Naur slackpkg.orig/usr/sbin/slackpkg slackpkg/usr/sbin/slackpkg --- slackpkg.orig/usr/sbin/slackpkg 2011-03-25 03:42:10.000000000 +0100 +++ slackpkg/usr/sbin/slackpkg 2013-02-10 08:15:25.823054758 +0100 @@ -30,12 +30,12 @@ # # CONF = configuration directory -# SOURCE = A mirror of Slackware. Source can be sett by editing $CONF/mirrors +# SOURCE = A mirror of Slackware. Source can be set by editing $CONF/mirrors # -VERSION=2.81.1 +VERSION=2.82.0 PATH=/bin:/usr/bin:/sbin:/usr/sbin SLACKWARE_VERSION=$(cat /etc/slackware-version | cut -f2 -d\ ) -CONF=/etc/slackpkg +CONF=${CONF:-/etc/slackpkg} SOURCE=$(sed -e 's/^[[:blank:]]*//' $CONF/mirrors | grep -m1 -e "^\([a-z]\)") . $CONF/slackpkg.conf ERROR=""