#!/bin/bash


slackpkg update

#SLACKPKGOPTS="-dialog=off -batch=on -default_answer=n"

CONF=${CONF:-/etc/slackpkg}

#TMPDIR=$(mktemp -p /tmp -d distupg.XXXXXX 2>/dev/null)
TMPDIR=/tmp/distupg
mkdir -p $TMPDIR
cd $TMPDIR
rm -f *

SLACKWARE_VERSION=$(cat /etc/slackware-version | cut -f2 -d\ )
SOURCE=$(sed -e 's/^[[:blank:]]*//' $CONF/mirrors | grep -m1 -e "^\([a-z]\)")
. $CONF/slackpkg.conf
. $CONF/slackpkgplus.conf



PKGS_PRIORITY=( ktown restricted_current:vlc )

( cd $ROOT/ ; ls -1tr ./var/log/packages/* ) | awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist



SLACKDIR_REGEXP="^((slackware)|(slackware64)|(extra)|(pasture)|(patches)|(testing))$"


cp $WORKDIR/pkglist ${TMPDIR}/pkglist-ori


PKGS_PRIORITY=( ${PKGS_PRIORITY[@]} patches slackware slackpkgplus )
for pp in ${PKGS_PRIORITY[@]} ; do
  repository=$(echo "$pp" | cut -f1 -d":")
  if [ "$pp" == "$repository" ];then
    package=".*"
  else
    package=$(echo "$pp" |cut -f2- -d":")
  fi
  if ! echo "$repository" | grep -qwE "$SLACKDIR_REGEXP" ; then
    repository=SLACKPKGPLUS_${repository}
  fi

  if grep -q "^${repository}[ ]" $WORKDIR/pkglist 2>/dev/null ; then
    NEW_PRIORITY=( ${NEW_PRIORITY[*]} $repository:$package )
    cat $WORKDIR/pkglist|grep -E "$repository $package " >> ${TMPDIR}/pkglist
  fi
done
echo ${NEW_PRIORITY[*]}

cat ${TMPDIR}/pkglist |awk '{if(!i[$2]++)print $0}' > ${TMPDIR}/pkglist-single


cat ${TMPDIR}/pkglist-single|sort -i |awk '{print "<",$6,$2}'  >$TMPDIR/toinstall
cat ${TMPDIR}/tmplist       |sort -i |awk '{print ">",$6,$2}'  >$TMPDIR/installed

cat installed toinstall |sort -k2|uniq -f1 -d|sort -k2 > $TMPDIR/ok
cat installed toinstall |sort -k2|uniq -f1 -u|sort -k2|uniq -f2 -D > $TMPDIR/upgrade
cat installed toinstall |sort -k2|uniq -f1 -u|sort -k2|uniq -f2 -D|grep '>' > $TMPDIR/upgrade-from
cat installed toinstall |sort -k2|uniq -f1 -u|sort -k2|uniq -f2 -D|grep '<' > $TMPDIR/upgrade-to
cat installed toinstall |sort -k2|uniq -f1 -u|sort -k2|uniq -f2 -u|grep '>' > $TMPDIR/remove
cat installed toinstall |sort -k2|uniq -f1 -u|sort -k2|uniq -f2 -u|grep '<' > $TMPDIR/add

echo "Install-new"

slackpkg $SLACKPKGOPTS -postinst=off install-new

echo "Upgrading"

slackpkg $SLACKPKGOPTS -postinst=off upgrade-all
#slackpkg -batch=on -dialog=off -default_answer=no upgrade-all
if [ ! -e ${WORKDIR}/pkglist ];then
  cp ${TMPDIR}/pkglist-ori ${WORKDIR}/pkglist
fi

echo "Install-all"

slackpkg $SLACKPKGOPTS -postinst=off install $(cat $TMPDIR/add|awk '{print $2}')
#slackpkg -batch=on -dialog=off -default_answer=no install $(cat $TMPDIR/add|awk '{print $2}')

echo "Remove"

slackpkg $SLACKPKGOPTS -postinst=off remove $(cat $TMPDIR/remove|awk '{print $2}')
#slackpkg -batch=on -dialog=off -default_answer=no remove $(cat $TMPDIR/remove|awk '{print $2}')


echo "Search conflicts"
cd /var/log/packages

r=""
for p in `ls -t`;do 
  echo -en "\r $p                "
  if grep -q $p $TMPDIR/upgrade-to;then
    echo "  Upgraded"
    D="$(cat $p|grep -v ' ' |grep /|grep -v /$|grep -v ^install/|sed -e 's/^/^/' -e 's/$/$/'|grep -f - *|grep -v ^$p:|sed 's/:/ /')"
    D="$(echo "$D"|awk '{print $1}'|sort -u)"
    echo "  Conflicts:" $D
    for c in $D;do
      echo -n "    $c "
      E=$(grep -e " $p " -e " $c " $TMPDIR/pkglist|head -1|awk '{print $6}')
      R=$(grep -e " $p " -e " $c " $TMPDIR/pkglist|awk '{print $1}'|sort -u|wc -l)
      if [ $R -eq 1 ];then
        echo "ok ($c and $p are on the same repository)"
      elif [ "$E" == "$p" ];then 
        echo "ok ($E is in priority)"
      elif [ $c -nt $p ];then
        echo "ok ($c is the latest installed)"
      else
        echo "to reinstall"
        r="$r $c"
      fi
    done
  fi
done
echo -e "\r                                               "

t=$(
for p in $r;do
  echo $p
done|sort -u
)

if [ ! -z "$t" ];then
  echo "To reinstall: $t"
  slackpkg $SLACKPKGOPTS -postinst=off reinstall $t
fi

echo

echo "To Clean"

slackpkg $SLACKPKGOPTS -postinst=off clean-system


echo "Postconf"
slackpkg new-config

echo "You may run $0 two times"

# DETAILED_INFO=yes slackpkg info slackpkg+

PACKAGE NAME:  slackpkg+-1.7.b2-noarch-1mt.txz
PACKAGE MIRROR:  http://www.slakfinder.org/slackpkg+dev/
PACKAGE LOCATION:  ./pkg
PACKAGE SIZE (compressed):  32 K
PACKAGE SIZE (uncompressed):  160 K
PACKAGE DESCRIPTION:
slackpkg+: slackpkg+ plugin for third-party repositories
slackpkg+:
slackpkg+: Slackpkg is a package manager for Slackware. 
slackpkg+:
slackpkg+: Slackpkg+ is a plugin for slackpkg.
slackpkg+:   It adds support for third-party repositories.
slackpkg+:   You can install, upgrade and search from multiple repositories.
slackpkg+:
slackpkg+:
slackpkg+:
slackpkg+:


Package:    slackpkg+-1.7.b2-noarch-1mt
Repository: slackpkgplus
Path:       ./pkg/slackpkg+-1.7.b2-noarch-1mt.txz
Url:        http://slakfinder.org/slackpkg+dev/pkg/slackpkg+-1.7.b2-noarch-1mt.txz

# DETAILED_INFO=filelist slackpkg info slackpkg+

PACKAGE NAME:  slackpkg+-1.7.b2-noarch-1mt.txz
PACKAGE MIRROR:  http://www.slakfinder.org/slackpkg+dev/
PACKAGE LOCATION:  ./pkg
PACKAGE SIZE (compressed):  32 K
PACKAGE SIZE (uncompressed):  160 K
PACKAGE DESCRIPTION:
slackpkg+: slackpkg+ plugin for third-party repositories
slackpkg+:
slackpkg+: Slackpkg is a package manager for Slackware. 
slackpkg+:
slackpkg+: Slackpkg+ is a plugin for slackpkg.
slackpkg+:   It adds support for third-party repositories.
slackpkg+:   You can install, upgrade and search from multiple repositories.
slackpkg+:
slackpkg+:
slackpkg+:
slackpkg+:

Package:    slackpkg+-1.7.b2-noarch-1mt
Repository: slackpkgplus
Path:       ./pkg/slackpkg+-1.7.b2-noarch-1mt.txz
Url:        http://slakfinder.org/slackpkg+dev/pkg/slackpkg+-1.7.b2-noarch-1mt.txz
Filelist:
  ./
  etc/
  etc/slackpkg/
  etc/slackpkg/notifymsg.conf.new
  etc/slackpkg/greylist.new
  usr/
  usr/doc/
  usr/doc/slackpkg+-1.7.b2/
  usr/doc/slackpkg+-1.7.b2/slackpkgplus.x86.sample
  usr/doc/slackpkg+-1.7.b2/slackpkg+.SlackBuild
  usr/doc/slackpkg+-1.7.b2/checkrepos.sh
  usr/doc/slackpkg+-1.7.b2/setupmultilib.sh
  usr/doc/slackpkg+-1.7.b2/slackpkgplus.x86_64.sample
  usr/doc/slackpkg+-1.7.b2/ChangeLog.txt
  usr/doc/slackpkg+-1.7.b2/README
  usr/doc/slackpkg+-1.7.b2/repositories.lst
  usr/doc/slackpkg+-1.7.b2/repositories.txt
  usr/libexec/
  usr/libexec/slackpkg/
  usr/libexec/slackpkg/functions.d/
  usr/libexec/slackpkg/functions.d/slackpkgplus.sh
  usr/libexec/slackpkg/makeinstlog.sh
  install/
  install/doinst.sh
  install/slack-desc

diff --git a/src/slackpkgplus.sh b/src/slackpkgplus.sh
index 07191e6..4695169 100755
--- a/src/slackpkgplus.sh
+++ b/src/slackpkgplus.sh
@@ -114,10 +114,37 @@ if [ "$SLACKPKGPLUS" = "on" ];then
   ##### ====== END BLACKLIST FUNCTIONS === #####
 
   ##### ====== INSTALL/POSTINSTALL FUNCTIONS ====== #####
+  function more_info(){
+    echo
+    cat $WORKDIR/pkglist|grep -E "^[^ ]* $NAME "|while read repository name version arch tag namepkg fullpath ext;do
+      echo "Package:    $namepkg"
+      echo "Repository: ${repository/SLACKPKGPLUS_/}"
+      echo "Path:       ${fullpath/\/SLACKPKGPLUS_${repository/SLACKPKGPLUS_/}/}/$namepkg.$ext"
+      URLFILE=${SOURCE}${fullpath}/${namepkg}.${ext}
+      if echo $URLFILE|grep -q /SLACKPKGPLUS_;then
+        PREPO=$(echo $URLFILE|sed -r 's#^.*/SLACKPKGPLUS_([^/]+)/.*$#\1#')
+        URLFILE=$(echo $URLFILE|sed "s#^.*/SLACKPKGPLUS_$PREPO/#${MIRRORPLUS[$PREPO]}#")
+      fi
+      echo "Url:        ${URLFILE/.\//}"
+      if [ "$DETAILED_INFO" == "filelist" ];then
+        FILELIST="$(zgrep ^${fullpath/\/${repository}/}/$namepkg.$ext $WORKDIR/$repository-filelist.gz 2>/dev/null)"
+        if [ -z "$FILELIST" ];then
+          echo "Filelist:   no file list available"
+        else
+          echo "Filelist:"
+          echo "$FILELIST"|sed "s/ /\n/g"|tail +2|sed 's/^/  /'
+        fi
+      fi
+      echo
+    done
+  }
 
     # Override cleanup() to improve log messages and debug functions
     #
   function cleanup(){
+    if [ "$CMD" == "info" ];then
+      [[ "$DETAILED_INFO" != "none" ]]&&more_info
+    fi
     rm -f ${TMPDIR}/waiting
     if [ "$CMD" == "update" ];then
       if [ "$ANSWER" != "Y" ] && [ "$ANSWER" != "y" ]; then

--- a/src/slackpkgplus.sh
+++ b/src/slackpkgplus.sh
@@ -930,7 +930,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
           }' l_dir=${DIR} > $PKGINFOS
 
       else # -- CMD==search
-        grep ${GREPOPTS} "^$DIR" $WORKDIR/pkglist|grep ${GREPOPTS} "/SLACKPKGPLUS_$SEARCHSTR/\|/$SEARCHSTR/\|/$SEARCHSTR \| [^ /]*$SEARCHSTR[^ /]* " > $PKGINFOS
+        grep -h ${GREPOPTS} "^$DIR" ${WORKDIR}/pkglist ${TMPDIR}/pkglist-pre|grep ${GREPOPTS} "/SLACKPKGPLUS_$SEARCHSTR/\|/$SEARCHSTR/\|/$SEARCHSTR \| [^ /]*$SEARCHSTR[^ /]* " > $PKGINFOS
       fi
 
       while read PKGDIR PKGBASENAME PKGVER PKGARCH PKGBUILD PKGFULLNAME PKGPATH PKGEXT ; do
@@ -1423,7 +1423,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
         continue
       fi
       ( cd $localpath
-        ls -ld *.t[blxg]z|sort -rn|grep ^-|awk '{print "./SLACKPKGPLUS_'$PREPO'/"$NF}'|awk -f /usr/libexec/slackpkg/pkglist.awk >> ${TMPDIR}/pkglist-pre
+        find . -type f -name '*.t[blxg]z'|sed "s,^./,./SLACKPKGPLUS_$PREPO/,"|awk -f /usr/libexec/slackpkg/pkglist.awk|sort -k6 -rn >> ${TMPDIR}/pkglist-pre
       )
     fi
   done
@@ -1490,7 +1490,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
           localpath=$(pwd)/$localpath
         fi
         ( cd $localpath
-          ls -ld *.t[blxg]z 2>/dev/null|sort -rn|grep ^-|awk '{print "./SLACKPKGPLUS_'$repository'/"$NF}'|awk -f /usr/libexec/slackpkg/pkglist.awk >> ${TMPDIR}/pkglist-pre
+          find . -type f -name '*.t[blxg]z'|sed "s,^./,./SLACKPKGPLUS_$PREPO/,"|awk -f /usr/libexec/slackpkg/pkglist.awk|sort -k6 -rn >> ${TMPDIR}/pkglist-pre
         )
         MIRRORPLUS[$repository]="file:/$localpath/"
         PRIORITYLIST=( ${PRIORITYLIST[*]} SLACKPKGPLUS_${repository}:.* )

--- slackpkgplus.sh.git.1.7.b3	2016-03-10 11:09:31.987399437 +0100
+++ slackpkgplus.sh	2016-03-10 18:07:39.172698579 +0100
@@ -1079,14 +1079,102 @@
     export DIALOG_ITEM_HELP="2"
     export DIALOG_OK="0"
 
+      # Prints, into a dialog box, the changelog entries about the packages listed in file $1
+      #
+    function showChangeLogInfo() {
+	local PKGREGEX="[.]t[blxg]z[:][ ]+(added|moved|rebuilt|removed|upgraded)"
+	local SEPREGEX="^[+][-]+[+][ ]*$"
+	local Cpkg
+	local CpkgInfos
+	local Idx
+	local CLogStartIdx
+	local CLogEndIdx
+	local Pathname
+	local Status
+	local Cline
+
+		# Extract each package entry in ChangeLog.txt and store them in 
+		# $WORKDIR/ChangeLog-packages.idx
+		#
+		# The output file is formatted as below :
+		#   <idx>:<pathname>: <status>
+		#
+		# <idx> is the line index of the entry in original ChangeLog.txt
+		# <pathname> is the full pathname of the package (ie. a/cryptsetup-1.7.1-x86_64-1.txz)
+		# <status> is the package status, which can be added,moved,rebuilt,removed,upgraded)
+		#
+		# [PENDING] this should be done only once when slackpkg update is called 
+		#
+	grep -inE "$PKGREGEX" $WORKDIR/ChangeLog.txt > $WORKDIR/ChangeLog-packages.idx
+
+	echo -n "" > $TMPDIR/Packages.clog
+
+	for Cpkg in $(<$TMPDIR/dialog.out) ; do
+
+		#  get infos about the current package from changeLog-packages.idx file, if any. The
+		#  variable CpkgInfos is a string formatted as below:
+		#    <idx1>:<clogidx>:<pathname>: <status>
+		#
+		#  idx1=index of the line in changelog-packages.idx which match Cpkg
+		#  clogidx=line index of the entry in ChangeLog.txt that match Cpkg
+		# 
+		CpkgInfos=( $(grep -n $Cpkg  $WORKDIR/ChangeLog-packages.idx | tr ":" " ") )
+
+		if [ ! -z "$CpkgInfos" ] ; then	
+			Idx=${CpkgInfos[0]}
+			CLogStartIdx=${CpkgInfos[1]}
+			Pathname=${CpkgInfos[2]}
+			Status=$(echo ${CpkgInfos[3]} | tr --delete " .")
+
+			echo "$Pathname ($Status)" >> $TMPDIR/Packages.clog
+
+			# extra information on package Cpkg can be found in ChangeLog.txt file 
+			# starting at line CLogStartIdx+1 and ending the line before the first 
+			# line matching the regular expression SEPREGEX or PKGREGEX.
+			#
+			# SEPREGEX match the "standard" changelog separator entry, ie. a string
+			# which start with a plus followed by dashes and a plus. For instance:
+			#  +----------------------+
+			#
+			# PKGREGEX match the "standard" changelog package entry, ie. a string
+			# which starts with a package pathname followed by colon, one or more 
+			# space and the status. For instance:
+			#   n/bind-1.2.3-x86_64-1.txz: Upgraded.
+
+			((CLogStartIdx++))
+
+			tail -n "+$CLogStartIdx" $WORKDIR/ChangeLog.txt | while read Cline ; do 
+				if ! echo "$Cline" | grep -qiE "($SEPREGEX)|($PKGREGEX)" ; then
+					echo -e "\t$Cline" >> $TMPDIR/Packages.clog
+				else
+					break
+				fi
+			done
+			echo "" >> $TMPDIR/Packages.clog
+		fi
+	done
+	
+	dialog	--title "ChangeLog" \
+		--backtitle "slackpkg $VERSION" $HINT \
+		--textbox $TMPDIR/Packages.clog 19 70 
+    }
+
+
     # Show the lists and asks if the user want to proceed with that action
     # Return accepted list in $SHOWLIST
     #
     function showlist() {
+      local CLOGopt=false
+      local EXIT=false
+
       if [ "$ONOFF" != "off" ]; then
         ONOFF=on
       fi
 
+      if [ "$2" == "upgrade" ] || [ "$2" == "upgrade-all" ] || [ "$2" == "install" ] ; then
+	CLOGopt=true
+      fi
+
       cat $TMPDIR/greylist.* >$TMPDIR/greylist
       if [ "$GREYLIST" == "off" ];then
         >$TMPDIR/greylist
@@ -1149,23 +1237,90 @@
       if [ "$DOWNLOADONLY" == "on" ];then
         DTITLE="$DTITLE (download only)"
       fi
-      cat $TMPDIR/dialog.tmp|xargs dialog --title "$DTITLE" --backtitle "slackpkg $VERSION" $HINT --checklist "Choose packages to $2:" 19 70 13 2>$TMPDIR/dialog.out
-      case "$?" in
-        0|123)
-          dialog --clear
-        ;;
-        1|124|125|126|127)
-          dialog --clear
-          echo -e "DIALOG ERROR:\n-------------" >> $TMPDIR/error.log
-          cat $TMPDIR/dialog.out >> $TMPDIR/error.log
-          echo "-------------"
-          echo "If you want to continue using slackpkg, disable the DIALOG option in"
-          echo "$CONF/slackpkg.conf and try again."
-          echo "Help us to make slackpkg a better tool - report bugs to the slackpkg"
-          echo "developers" >> $TMPDIR/error.log
-          cleanup
-        ;;
-      esac
+
+      if $CLogOpt ; then
+	# When the user "click" the button <ChangeLog> to read the changelog of 
+	# the selected pacakges, the 
+	# duplicate TMPDIR/dialog.tmp so that all items are deselected to be able to
+	# regenerate the list of selected items when showChangeLogInfo() returns, ie.
+	# when the user has checked the changelog.
+
+	# When the user "clicks" the button "<ChangeLog>" to read the changelog of 
+	# currently selected packages,  the dialog to select packages is terminated 
+	# and the changelog is printed in a textbox. 
+	#
+	# When the user exits from the textbox, the user must retrieve the packages 
+	# selection dialog with the packages that were selected previously. To do that, 
+	# the file $TMPDIR/dialog.tmp is duplicated with all items deselected into 
+	# file $TMPDIR/dialog.tmp.off, so that the list of selected packages can 
+	# be regenerated using the data in file $TMPDIR/dialog.out when 
+	# showChangeLogInfos() returns.
+
+	cat $TMPDIR/dialog.tmp | sed "s/ on / off /g" > $TMPDIR/dialog.tmp.off
+      fi
+
+      while ! $EXIT ; do
+
+	if $CLOGopt ; then
+		dialog	--extra-button \
+			--extra-label "ChangeLog" \
+			--title "$DTITLE" \
+			--backtitle "slackpkg $VERSION" $HINT \
+			--checklist "Choose packages to $2:" \
+			19 70 13 \
+			--file $TMPDIR/dialog.tmp 2>$TMPDIR/dialog.out
+	else
+		dialog  --title "$DTITLE" \
+			--backtitle "slackpkg $VERSION" $HINT \
+			--checklist "Choose packages to $2:" \
+			19 70 13 \
+			--file $TMPDIR/dialog.tmp 2>$TMPDIR/dialog.out
+	fi
+
+	case $? in
+		0|1)
+			EXIT=true
+	       		dialog --clear
+		;;
+
+		3)
+			dialog --clear
+
+			if $CLOGopt ; then
+
+				if [ -s $TMPDIR/dialog.out ] ; then
+					showChangeLogInfo $TMPDIR/dialog.out
+
+					# regenerate the list of selected package from the patterns
+					# in TMPDIR/dialog.out and the file TMPDIR/dialog.tmp.off
+
+					PKGS_REGEX=$(cat $TMPDIR/dialog.out|sed "s/ /\\\|/g")
+
+					cat $TMPDIR/dialog.tmp.off > $TMPDIR/dialog.tmp
+					sed -i -e "/^$PKGS_REGEX/ s= off = on =" $TMPDIR/dialog.tmp
+				else
+					# all packages are deselected ...
+					cat $TMPDIR/dialog.tmp.off > $TMPDIR/dialog.tmp
+				fi
+			else
+				EXIT=true
+			fi 
+		;;
+
+		-1)
+			EXIT=true
+			dialog --clear
+			echo -e "DIALOG ERROR:\n-------------" >> $TMPDIR/error.log
+			cat $TMPDIR/dialog.out >> $TMPDIR/error.log
+			echo "-------------"
+			echo "If you want to continue using slackpkg, disable the DIALOG option in"
+			echo "$CONF/slackpkg.conf and try again."
+			echo "Help us to make slackpkg a better tool - report bugs to the slackpkg"
+			echo "developers" >> $TMPDIR/error.log
+			cleanup
+		;;
+	esac
+      done
       echo
       echo
       SHOWLIST=$(cat $TMPDIR/dialog.out | tr -d \")