From 2adf86f0413f84acaa158bcd0306ce16eff9ca35 Mon Sep 17 00:00:00 2001
From: slakmagik <slakmagik@18908463-3d48-0410-af50-6b38eb639d31>
Date: Mon, 7 Mar 2011 01:26:32 +0000
Subject: [PATCH] make list_packages() loop

Wrap list_packages()'s main dialog widget in a while loop so the user
can return to deletion selection after reading readmes. Also correct the
text in the widget (s/uninstall/remove./).
---
 src/usr/sbin/sbopkg | 52 +++++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/usr/sbin/sbopkg b/src/usr/sbin/sbopkg
index 148011d..ce7edaf 100755
--- a/src/usr/sbin/sbopkg
+++ b/src/usr/sbin/sbopkg
@@ -450,30 +450,36 @@ list_packages() {
         -printf "%P\n" 2> /dev/null | sort > $PKG_LIST
     if [[ -s $PKG_LIST ]]; then
         if [[ $DIAG ]]; then
-            sed 's/$/ "" OFF/' $PKG_LIST > $PKG_CHECKLIST
-            dialog --separate-output --title "Installed $REPO_NAME Packages" \
-                --extra-button --extra-label "View READMEs" \
-                --checklist "Check any packages you wish to uninstall" \
-                20 65 13 --file $PKG_CHECKLIST 2> $REMOVE_LIST
-            case $? in
-                0)
-                    if [[ -s $REMOVE_LIST ]]; then
-                        sed 's/$/ "" ON/' $REMOVE_LIST > $CONFIRM_LIST
-                        dialog --separate-output --defaultno \
-                            --title "Removepkg confirmation" \
-                            --checklist "Remove the following packages?" 20 65 13 \
-                            --file $CONFIRM_LIST 2> $REMOVE_LIST
-                        if [[ $? == 0 ]]; then
-                            removepkg $(cat $REMOVE_LIST)
-                            read -n1 -ep "Press any key to continue: "
+            while :; do
+                sed 's/$/ "" OFF/' $PKG_LIST > $PKG_CHECKLIST
+                dialog --separate-output --title "Installed $REPO_NAME Packages" \
+                    --extra-button --extra-label "View READMEs" \
+                    --checklist "Check any packages you wish to remove." \
+                    20 65 13 --file $PKG_CHECKLIST 2> $REMOVE_LIST
+                case $? in
+                    0)
+                        if [[ -s $REMOVE_LIST ]]; then
+                            sed 's/$/ "" ON/' $REMOVE_LIST > $CONFIRM_LIST
+                            dialog --separate-output --defaultno \
+                                --title "Removepkg confirmation" \
+                                --checklist "Remove the following packages?" 20 65 13 \
+                                --file $CONFIRM_LIST 2> $REMOVE_LIST
+                            if [[ $? == 0 ]]; then
+                                removepkg $(cat $REMOVE_LIST)
+                                read -n1 -ep "Press any key to continue: "
+                                break
+                            fi
+                        else
+                            break
                         fi
-                    fi
-                    ;;
-                3)
-                    nvabt2n $PKG_LIST $README_LIST
-                    view_readmes "Installed packages:" $README_LIST
-                    ;;
-            esac
+                        ;;
+                    3)
+                        nvabt2n $PKG_LIST $README_LIST
+                        view_readmes "Installed packages:" $README_LIST
+                        ;;
+                    *) break ;;
+                esac
+            done
         else
             $PAGER $PKG_LIST
         fi