mirrors/sbopkg
2
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2024-09-19 22:40:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

modify view_queue() to use selection_state()

Browse Source 
Traded a block of code for the function call and removed references to
the now unused WORKINGQUEUE.
This commit is contained in:
slakmagik 2011-03-07 01:26:56 +00:00
parent 511ef6f26f
commit 105e182449
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/usr/sbin/sbopkg
View File

@ -2107,7 +2107,6 @@ view_queue() {
# Returns 0 if the user choose OK, nonzero otherwise # Returns 0 if the user choose OK, nonzero otherwise
local ANSQUEUE=$SBOPKGTMP/sbopkg-ans-queue local ANSQUEUE=$SBOPKGTMP/sbopkg-ans-queue
local WORKINGQUEUE=$SBOPKGTMP/sbopkg-working-queue
local ORIGINALQUEUE=$SBOPKGTMP/sbopkg-original-queue local ORIGINALQUEUE=$SBOPKGTMP/sbopkg-original-queue
local CHOICE local CHOICE
@ -2131,17 +2130,7 @@ view_queue() {
# Strip that damn "HELP " text when choosing the HELP dialog button # Strip that damn "HELP " text when choosing the HELP dialog button
[[ $CHOICE -eq 2 ]] && sed -i 's:^HELP ::g' $ANSQUEUE [[ $CHOICE -eq 2 ]] && sed -i 's:^HELP ::g' $ANSQUEUE
rm -f $WORKINGQUEUE selection_state preserve $TMPQUEUE $ANSQUEUE
# Reading from $TMPQUEUE...
while read PICK; do
TESTAPP="${PICK// */}"
if grep -qx "$TESTAPP" $ANSQUEUE; then
sed 's/OFF$/ON/' <<< "$PICK" >> $WORKINGQUEUE
else
sed 's/ON$/OFF/' <<< "$PICK" >> $WORKINGQUEUE
fi
done < $TMPQUEUE
mv $WORKINGQUEUE $TMPQUEUE
case $CHOICE in case $CHOICE in
0) # OK 0) # OK
@ -2155,7 +2144,7 @@ view_queue() {
;; ;;
*) # Cancel or ESC *) # Cancel or ESC
mv $ORIGINALQUEUE $TMPQUEUE mv $ORIGINALQUEUE $TMPQUEUE
rm -f $WORKINGQUEUE $ANSQUEUE rm -f $ANSQUEUE
return 1 return 1
;; ;;
esac esac