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

Added spinning in check-updates.

Browse source 
Fixed bad trap ctrl+c when spinning is on.
This commit is contained in:
Matteo Rossini 2016-01-26 23:37:07 +01:00
parent 6fc76f9d0d
commit 5c33f270fb
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/slackpkgplus.sh
View file

@ -118,16 +118,17 @@ if [ "$SLACKPKGPLUS" = "on" ];then
# Override cleanup() to improve log messages and debug functions
#
function cleanup(){
rm -f ${TMPDIR}/waiting
if [ "$CMD" == "update" ];then
if [ "$ANSWER" != "Y" ] && [ "$ANSWER" != "y" ]; then
touch $WORKDIR/pkglist
fi
fi
[ "$TTYREDIRECTION" ] && exec 1>&3 2>&4
[ "$SPINNING" = "off" ] || tput cnorm
if [ "$DELALL" = "on" ] && [ "$NAMEPKG" != "" ]; then
rm $CACHEPATH/$NAMEPKG &>/dev/null
fi
wait
if [ $VERBOSE -gt 2 ];then
echo "The temp directory $TMPDIR will NOT be removed!" >>$TMPDIR/info.log
echo
@ -877,6 +878,8 @@ if [ "$SLACKPKGPLUS" = "on" ];then
cat ${WORKDIR}/pkglist | applyblacklist > ${TMPDIR}/pkglist
touch ${TMPDIR}/waiting
echo -n "Looking for $PATTERN in package list. Please wait... "
[ "$SPINNING" = "off" ] || spinning ${TMPDIR}/waiting &
[ "$SENSITIVE_SEARCH" = "off" ] && GREPOPTS="--ignore-case"
@ -945,12 +948,11 @@ if [ "$SLACKPKGPLUS" = "on" ];then
done < $PKGINFOS
done
rm ${TMPDIR}/waiting
rm -f $PKGLIST $PKGINFOS
LIST=$(echo -e $LIST | tr \ "\n" | uniq )
rm ${TMPDIR}/waiting
echo -e "DONE\n"
} # END function searchPackages()
@ -1617,10 +1619,21 @@ if [ "$SLACKPKGPLUS" = "on" ];then
echo -n "" > ~/.slackpkg/updated-repos.txt
UPDATES=false
touch ${TMPDIR}/waiting
if [ $VERBOSE -eq 3 ];then
checkchangelog
else
if [[ ! ${SPINNING} = "off" ]]; then
echo -n "Searching for updates... "
spinning ${TMPDIR}/waiting &
fi
exec 3>&1 4>&2
TTYREDIRECTION=1
checkchangelog >/dev/null 2>&1
TTYREDIRECTION=""
exec 1>&3 2>&4
fi
if [ $? -ne 0 ]; then
@ -1666,6 +1679,7 @@ if [ "$SLACKPKGPLUS" = "on" ];then
[ -s "${TMPDIR}/updated-repos.txt" ] && UPDATES=true
fi
rm -f ${TMPDIR}/waiting
if $UPDATES ; then
echo "News on ChangeLog.txt"