Version 20131119.1 - 19/Nov/2013

- 'slackpkg update' also update the install.log
  - 'makeinstlog.sh -t' TRY to detect the repository from which the package
    was installed.
  - improved greylist. Now accept regex and repository name.
  - Added WGETOPTS

ChangeLog.txt

@@ -1,3 +1,10 @@
+Version 20131119.1 - 19/Nov/2013
+  - 'slackpkg update' also update the install.log
+  - 'makeinstlog.sh -t' TRY to detect the repository from which the package
+    was installed.
+  - improved greylist. Now accept regex and repository name.
+  - Added WGETOPTS
+
 Version 20131118.2 - 18/Nov/2013
   - Moved makeinstlog.sh in libexec path. Now slackpkg update also update
   install.log

src/ChangeLog.txt

@@ -1,3 +1,10 @@
+Version 20131119.1 - 19/Nov/2013
+  - 'slackpkg update' also update the install.log
+  - 'makeinstlog.sh -t' TRY to detect the repository from which the package
+    was installed.
+  - improved greylist. Now accept regex and repository name.
+  - Added WGETOPTS
+
 Version 20131118.2 - 18/Nov/2013
   - Moved makeinstlog.sh in libexec path. Now slackpkg update also update
   install.log

src/greylist

@@ -1,3 +1,8 @@
 # All packages in that list will be showned but
 # unchecked by default
-# You must enter exact package name
+#
+# You can greylist using regular expressions.
+#
+# Don't use *full* regex here, because all of the following
+# will be checked for the regex: series, name, version, arch,
+# build, fullname and repository name.

src/slackpkgplus.sh

@@ -27,7 +27,7 @@ fi
 
 if [ "$SLACKPKGPLUS" = "on" ];then
 
-  SPKGPLUS_VERSION="1.0"
+  SPKGPLUS_VERSION="1.0.1-dev"
   VERSION="$VERSION / slackpkg+ $SPKGPLUS_VERSION"
   
   
@@ -481,9 +481,10 @@ if [ "$SLACKPKGPLUS" = "on" ];then
     done
   }
 
-  touch $TMPDIR/greylist.tmp
+  touch $TMPDIR/greylist.1
   if [ -e /etc/slackpkg/greylist ];then
-    cat /etc/slackpkg/greylist|sed -e 's/#.*//'|grep -v -e '^#' -e '^$'|awk '{print $1}'|sort -u >$TMPDIR/greylist.tmp
+    cat /etc/slackpkg/greylist|sed -e 's/#.*//'|grep -v -e '^#' -e '^$'|awk '{print $1}'|sort -u >$TMPDIR/greylist.1
+    cat $TMPDIR/greylist.1|sed 's/^/SLACKPKGPLUS_/' >$TMPDIR/greylist.2
   fi
 
   REPOPLUS=$(echo "${REPOPLUS[*]} ${PKGS_PRIORITY[*]} ${!MIRRORPLUS[*]}"|sed 's/ /\n/g'|sed 's/:.*//'|awk '{if(!a[$1]++)print $1}')
@@ -572,6 +573,8 @@ if [ "$SLACKPKGPLUS" = "on" ];then
     if [ "$(head -1 ${TMPDIR}/blacklist.tmp|awk '{print $1}')" != "local" ];then
       cat ${TMPDIR}/pkglist-pre
     fi
+    cat $TMPDIR/greylist.* >$TMPDIR/greylist
+    grep -qvEw -f $TMPDIR/greylist $TMPDIR/pkglist-pre >$TMPDIR/unchecklist
 
   }
   
@@ -910,6 +913,5 @@ if [ "$SLACKPKGPLUS" = "on" ];then
     cleanup
   fi
 
-  cat $TMPDIR/greylist*|sort -u >$TMPDIR/unchecklist
 
 fi

src/zdialogplus.sh

@@ -19,6 +19,9 @@ if [ "$SLACKPKGPLUS" = "on" ];then
 		if [ "$ONOFF" != "off" ]; then
 			ONOFF=on
 		fi
+		cat $TMPDIR/greylist.* >$TMPDIR/greylist
+		grep -Ew -f $TMPDIR/greylist $TMPDIR/pkglist|awk '{print $2}' >$TMPDIR/unchecklist
+
 		rm -f $TMPDIR/dialog.tmp
 		
 		if [ "$2" = "upgrade" ]; then