From 8155da8773c82a200980706bec544929b5a646c6 Mon Sep 17 00:00:00 2001
From: slakmagik <slakmagik@18908463-3d48-0410-af50-6b38eb639d31>
Date: Mon, 7 Mar 2011 01:26:09 +0000
Subject: [PATCH] change VARNAMES to VAR_NAMES

Also drop the overly-specific 'SBO' from SBOPKGLIST as it's actually
whatever $REPO is.
---
 src/usr/sbin/sbopkg | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/usr/sbin/sbopkg b/src/usr/sbin/sbopkg
index 8714653..5550066 100755
--- a/src/usr/sbin/sbopkg
+++ b/src/usr/sbin/sbopkg
@@ -424,31 +424,31 @@ EOF
 list_packages() {
     # Get a list of SBo packages.
 
-    local SBOPKGLIST=$SBOPKGTMP/sbopkg_pkglist
-    local REMOVELIST=$SBOPKGTMP/sbopkg_removelist
-    local CONFIRMLIST=$SBOPKGTMP/sbopkg_confirmlist
+    local PKG_LIST=$SBOPKGTMP/sbopkg_pkg_list
+    local REMOVE_LIST=$SBOPKGTMP/sbopkg_remove_list
+    local CONFIRM_LIST=$SBOPKGTMP/sbopkg_confirm_list
 
-    rm -f $SBOPKGLIST
+    rm -f $PKG_LIST
     find /var/log/packages -type f -name "*$REPO_TAG" \
-        -printf "%P\n" 2> /dev/null | sort > $SBOPKGLIST
-    if [[ -s $SBOPKGLIST ]]; then
+        -printf "%P\n" 2> /dev/null | sort > $PKG_LIST
+    if [[ -s $PKG_LIST ]]; then
         if [[ $DIAG ]]; then
-            sed -i 's/$/ "" OFF/' $SBOPKGLIST
+            sed -i 's/$/ "" OFF/' $PKG_LIST
             dialog --separate-output --title "Installed $REPO_NAME Packages" --checklist \
                 "Check any packages you wish to uninstall" 20 65 13 \
-                --file $SBOPKGLIST 2> $REMOVELIST
-            if [[ -s $REMOVELIST ]]; then
-                sed 's/$/ "" ON/' $REMOVELIST > $CONFIRMLIST
+                --file $PKG_LIST 2> $REMOVE_LIST
+            if [[ -s $REMOVE_LIST ]]; then
+                sed 's/$/ "" ON/' $REMOVE_LIST > $CONFIRM_LIST
                 dialog --defaultno --title "Removepkg confirmation" \
                     --checklist "Remove the following packages?" 20 65 13 \
-                    --file $CONFIRMLIST 2> $REMOVELIST
+                    --file $CONFIRM_LIST 2> $REMOVE_LIST
                 if [[ $? == 0 ]]; then
-                    removepkg $(tr -d \" < $REMOVELIST)
+                    removepkg $(tr -d \" < $REMOVE_LIST)
                     read -n1 -ep "Press any key to continue: "
                 fi
             fi
         else
-            $PAGER $SBOPKGLIST
+            $PAGER $PKG_LIST
         fi
     else
         if [[ $DIAG ]]; then
@@ -457,7 +457,7 @@ list_packages() {
                 installed.")" 8 40
         fi
     fi
-    rm -f $SBOPKGLIST $REMOVELIST $CONFIRMLIST
+    rm -f $PKG_LIST $REMOVE_LIST $CONFIRM_LIST
 }
 
 progressbar_cli() {