From 8d4fba2225c7a408cbcd897165d9b44d4e58b6e9 Mon Sep 17 00:00:00 2001
From: "chess.griffin" <chess.griffin@18908463-3d48-0410-af50-6b38eb639d31>
Date: Wed, 21 Jan 2009 13:45:24 +0000
Subject: [PATCH] a few minor tweaks to some comments; clarify that deleting
 all items from queue cannot be undone; fix issue in save_user_queue where the
 queue was sorted, it now just copies the TMPQUEUE to the USERQUEUE.

---
 src/usr/bin/sbopkg | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/usr/bin/sbopkg b/src/usr/bin/sbopkg
index 8e7f149..382084f 100755
--- a/src/usr/bin/sbopkg
+++ b/src/usr/bin/sbopkg
@@ -48,10 +48,10 @@ CWD="$(pwd)"
 SBOVER=svn_r$(cat ${0} | grep '$Id: ' | head -1 | \
 sed -e 's/^.*Id: sbopkg \([0-9.]*\) .*$/\1/')
 
-# the inspiration for these two functions comes from the crunch() in
-# installpkg. Both take one argument - the first reduces runs of spaces to one
-# and the second does that and reformats to 78 columns.
 crunch() {
+    # the inspiration for this and the next function comes from the crunch()
+    # in installpkg. Both take one argument - the first reduces runs of spaces
+    # to one and the second does that and reformats to 78 columns.
     echo "$@" | tr -s ' '
 }
 
@@ -706,9 +706,7 @@ get_category_list () {
 
 get_category_items_list () {
     # This function makes and displays a list of all the package items in
-    # the selected category.  Ideally, it would be nice to have this be a
-    # checklist where the user can select multiple applications to build
-    # in a queue.
+    # the selected category.
     CATEGORY="$(cat $TMP/sbopkg_category_selection)"
     cd $LOCALREPO/$SLACKVER/$CATEGORY
     rm -f $TMP/sbopkg_category_items_list 2> /dev/null
@@ -1238,9 +1236,7 @@ save_user_queue () {
                     continue
                 fi
             fi
-            rm -f $USERQUEUE
-            touch $USERQUEUE
-            sort $TMPQUEUE | uniq > $USERQUEUE
+            cp $TMPQUEUE $USERQUEUE
             dialog --title "Done" --msgbox \
                 "The build queue has been saved." 8 30
         fi
@@ -1273,7 +1269,8 @@ delete_build_queue () {
             queue by highlighting them and pressing <Ok>.  Press <Done> when \
             you are finished and the individual deletions will be \
             committed.  Otherwise, press <Cancel> at any time to abort your \
-            changes.")" 25 60 8 \
+            changes.\n\nYou can also press <Delete All> to immediately \
+            clear the queue.  This cannot be undone.")" 25 60 8 \
             --file $REMOVEQUEUE 2>$TMP/sbopkg-ans-queue
         CHOICE=$? # 0 = Delete, 1 = Cancel, 2=Done, 3 = Delete All
         REMOVED=$(cat $TMP/sbopkg-ans-queue)
@@ -1306,13 +1303,13 @@ delete_build_queue () {
 }
 
 add_item_to_queue () {
-    # This function takes three argument, APP, VERSIONBUILD, and ONOFF.  If
+    # This function takes three arguments: APP, VERSIONBUILD, and ONOFF.  If
     # APP is already in the queue, ask user if they want to replace it (so
     # updated pkgs will get updated in the queue).  NOTE:  this is a
     # work-in-progress.  The idea is that whenever an item is added to the
     # queue, whether after the update run, or when an individual item is added
     # from the info_item menu, or when a backup or user's queue is loaded,
-    # then each APP, VERSIONBUILDi, and ONOFF is sent to this function for
+    # then each APP, VERSIONBUILD, and ONOFF is sent to this function for
     # processing.  Once this is working remove this NOTE from this comment.
     APP=$1
     VERSIONBUILD=$2