Miroirs/slackpkgplus
1
0
Fork 0
mirror of https://github.com/zuno/slackpkgplus synced 2024-12-27 09:58:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

- dialog did no more trap develop errors

Browse source 
- givepriority did drop matched package if it is the first in pkglist
This commit is contained in:
Matteo Rossini 2016-06-04 12:35:44 +02:00
parent 258bd4b50d
commit 2dfe8d4477
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog.txt
View file

@ -1,4 +1,4 @@
Version 1.7.0rc2 - 22/May/2016 Version 1.7.0rc2 - 02/Jun/2016
- ChangeLog did not skipped for dir:/ repositories - ChangeLog did not skipped for dir:/ repositories
- ChangeLog did not show correctly certain slackware changelog - ChangeLog did not show correctly certain slackware changelog
- dir:/ repositories does not need STRICTGPG nor GPG key; however remember - dir:/ repositories does not need STRICTGPG nor GPG key; however remember

22
src/slackpkgplus.sh
View file

@ -884,8 +884,10 @@ if [ "$SLACKPKGPLUS" = "on" ];then
if [ ! -z "$PKGINFOS" ] ; then if [ ! -z "$PKGINFOS" ] ; then
LINEIDX=${PKGINFOS/:*/} LINEIDX=${PKGINFOS/:*/}
PKGDATA=( ${PKGINFOS/*:/} ) PKGDATA=( ${PKGINFOS/*:/} )
mv ${TMPDIR}/pkglist ${TMPDIR}/pkglist.old if [ ${PRIORITYIDX} -ne ${LINEIDX} ];then
sed --expression "${LINEIDX}d" --expression "${PRIORITYIDX}i${PKGDATA[*]}" ${TMPDIR}/pkglist.old > ${TMPDIR}/pkglist mv ${TMPDIR}/pkglist ${TMPDIR}/pkglist.old
sed --expression "${LINEIDX}d" --expression "${PRIORITYIDX}i${PKGDATA[*]}" ${TMPDIR}/pkglist.old > ${TMPDIR}/pkglist
fi
(( PRIORITYIDX++ )) (( PRIORITYIDX++ ))
if [ "$PKGDATA" ]; then if [ "$PKGDATA" ]; then
NAME=${PKGDATA[1]} NAME=${PKGDATA[1]}
@ -976,8 +978,10 @@ if [ "$SLACKPKGPLUS" = "on" ];then
# R1:P is before R2:P in pkglist, and the user issue install|upgrade R2:P, slackpkg # R1:P is before R2:P in pkglist, and the user issue install|upgrade R2:P, slackpkg
# will install R1:P instead. # will install R1:P instead.
# #
mv ${TMPDIR}/pkglist ${TMPDIR}/pkglist.old if [ ${PRIORITYIDX} -ne ${LINEIDX} ];then
sed --expression "${LINEIDX}d" --expression "${PRIORITYIDX}i${PKGDATA[*]}" ${TMPDIR}/pkglist.old > ${TMPDIR}/pkglist mv ${TMPDIR}/pkglist ${TMPDIR}/pkglist.old
sed --expression "${LINEIDX}d" --expression "${PRIORITYIDX}i${PKGDATA[*]}" ${TMPDIR}/pkglist.old > ${TMPDIR}/pkglist
fi
(( PRIORITYIDX++ )) (( PRIORITYIDX++ ))
fi fi
done done
@ -1438,15 +1442,15 @@ if [ "$SLACKPKGPLUS" = "on" ];then
fi fi
;; ;;
-1) -1|124|125|126|127)
EXIT=true EXIT=true
dialog --clear dialog --clear
echo -e "DIALOG ERROR:\n-------------" >> $TMPDIR/error.log echo -e "DIALOG ERROR:\n-------------" >> $TMPDIR/error.log
cat $TMPDIR/dialog.out >> $TMPDIR/error.log cat $TMPDIR/dialog.out >> $TMPDIR/error.log
echo "-------------" echo "-------------" >> $TMPDIR/error.log
echo "If you want to continue using slackpkg, disable the DIALOG option in" echo "If you want to continue using slackpkg, disable the DIALOG option in" >> $TMPDIR/error.log
echo "$CONF/slackpkg.conf and try again." echo "$CONF/slackpkg.conf and try again." >> $TMPDIR/error.log
echo "Help us to make slackpkg a better tool - report bugs to the slackpkg" echo "Help us to make slackpkg a better tool - report bugs to the slackpkg" >> $TMPDIR/error.log
echo "developers" >> $TMPDIR/error.log echo "developers" >> $TMPDIR/error.log
cleanup cleanup
;; ;;