modify repository selection

This is a cluster of changes that fell out from adding the new repo
  file earlier.

  * select_repository(): changed the function to create a larger box
    with a different title and text and reordered menu items, both
    vertically (via the previously changed repos.d files) and
    horizontally (via reordering the item text). Also fixed a bug
    discovered while testing, which involves changing the repo even when
    directory creation is aborted. Now we store OLD_* vars and restore
    them and re-run set_repo_vars() on abort.

  * utilities_menu(): equivalent reordering.

  * dir_init(): changed to produce hopefully better output rather than
    wrongly implying that a directory that does exist doesn't. Also some
    ad hackery for git. I'm tempted to throw the whole function out -
    some programs might ask about mucking with a users $HOME but most
    don't ask to create necessary system files.

  * main: modified how we acquire REPO_NAME and REPO_BRANCH when
    CUSTOMVER is set.

  * NEWS: caught up with this and other recent changes.

src/usr/doc/NEWS

@@ -11,6 +11,18 @@ sbopkg xxxVERSIONxxx (xxxDATExxx)
         * Similarly, the -R and -p flags can now be combined to page
           through the READMEs of all installed packages.
 
+        * Added ponce's repo (SBo variant for -current) to the default
+          repos. Thanks to Mauro for suggesting this about a year ago.
+          Note that this is unsupported (if a build from this repo
+          breaks in sbopkg you get to keep both pieces) but people seem
+          pleased with this repo and it'll save a step for new users.
+          Note that the default repo files have been reordered, as well.
+          50-sb64 is now 70, 60-local is now 50, and the new one is 60.
+          This puts the unsupported repos last. If by chance you have a
+          file with those names already in there, upgrading sbopkg will
+          clobber them. See each of the two following sections for more
+          repo-related modifications and bugfixing.
+
     MODIFICATIONS
 
         * Updated French man pages. Thanks to Marie-Claude Collilieux.
@@ -22,6 +34,32 @@ sbopkg xxxVERSIONxxx (xxxDATExxx)
           block in README describing all the plain text documents, added
           a note about making corrections to THANKS, etc.
 
+        * The 'Choose a repository' dialog widget is now titled
+          'Repository Selection' and the widget text was revised. Also,
+          the menu itself used to say 'BRANCH (REPO) DESCRIPTION' and
+          now says 'REPO (BRANCH) DESCRIPTION'. The relevant item in the
+          Utilities menu that shows which repo/branch you're on and
+          takes you to the Repository Selection widget was similarly
+          re-ordered.
+
+        * When a repository directory does not exist, sbopkg now
+          displays, e.g.
+
+          REPO_{ROOT,NAME,BRANCH} -> /var/lib/sbopkg/,SBo/,13.1
+
+          or, in the case of git repos which don't currently have BRANCH
+          directories, it just shows REPO_{ROOT,NAME}. It used to
+          display
+
+          REPO_ROOT -----------> /var/lib/sbopkg/
+
+          While the new line may be odd looking, it should be clear
+          enough that it means REPO_ROOT is /var/lib/sbopkg/, REPO_NAME
+          is SBo/ and REPO_BRANCH is 13.1 and that these are path
+          components and that the path is missing. Before, it would say
+          /var/lib/sbopkg/ didn't exist if 13.1 was missing even when
+          /var/lib/sbopkg/ did exist.
+
     BUGFIXES
 
         * Fixed an issue where URL redirects and SSL certificate check
@@ -41,6 +79,11 @@ sbopkg xxxVERSIONxxx (xxxDATExxx)
           Sel" and making it do that was a feature/modification instead
           of a bugfix. ;)
 
+        * Fixed an issue were the user could switch repos, receive a
+          directory creation prompt, abort it, and the active repo would
+          be switched anyway, despite the directory not being created.
+          Now, the original repo is restored as the active one.
+
 sbopkg 0.34.1 (2011-02-05 04:20 UTC)
 
     FEATURES

src/usr/sbin/sbopkg

@@ -249,32 +249,25 @@ EOF
 }
 
 dir_init() {
-    # Check to make sure certain sbopkg-related directories exist.
+    # Check to make sure certain sbopkg-related directories exist. If not,
-    # If not, create them.
+    # create them.
 
     local -a DIR_VARS DI_OUTPUT_LINES DI_OUTPUT
     local DIRS2MK REPLY ERROR
 
     # Keep DIR_VARS and DI_OUTPUT_LINES in sync where REPO_DIR ~ REPO_ROOT.
 
-    # We show REPO_ROOT and make REPO_DIR because the REPO_DIR we need to make
-    # is assigned to elswhere in the script as a combination of
-    # REPO_ROOT/REPO_NAME and may or may not be combined with REPO_BRANCH -
-    # but these are all subdirectories of REPO_ROOT, so that's all we need to
-    # actually display and we can avoid the confusion we might get with a
-    # display like 'REPO_DIR[/REPO_NAME]'.
-
     DIR_VARS=(
         $REPO_DIR ${LOGFILE%/*} $QUEUEDIR $SRCDIR $TMP $OUTPUT
     )
 
     DI_OUTPUT_LINES=(
-        "REPO_ROOT -----------> $REPO_ROOT"
+        "REPO_{ROOT,NAME,BRANCH} -> $REPO_ROOT/,$REPO_NAME/,$REPO_BRANCH"
-        "LOGFILE directory ---> ${LOGFILE%/*}"
+        "LOGFILE directory -------> ${LOGFILE%/*}"
-        "QUEUEDIR ------------> $QUEUEDIR"
+        "QUEUEDIR ----------------> $QUEUEDIR"
-        "SRCDIR --------------> $SRCDIR"
+        "SRCDIR ------------------> $SRCDIR"
-        "TMP -----------------> $TMP"
+        "TMP ---------------------> $TMP"
-        "OUTPUT --------------> $OUTPUT"
+        "OUTPUT ------------------> $OUTPUT"
     )
 
     for ((i=0; i<${#DIR_VARS[*]}; i++)); do
@@ -290,11 +283,25 @@ dir_init() {
 
 The following directories do not exist:
 
-Variable               Assignment
+Variable                   Assignment
---------               ----------
+--------                   ----------
 EOF
             for ((i=0; i<${#DI_OUTPUT[*]}; i++)); do
-                echo "${DI_OUTPUT[$i]}"
+                # git doesn't use REPO_BRANCH in this context, so sed it out
+                # of the display - can you say "ad hackery"? I knew you could!
+                #
+                # We used to have DI_OUTPUT_LINES just display REPO_ROOT and
+                # create REPO_DIR to try to avoid confusion in the display to
+                # the user but then it would say a directory didn't exist just
+                # because its REPO_BRANCH subdirectory didn't exist which was
+                # even more confusing and outright wrong. So keep the
+                # replacement hyphens aligned here, too. *sigh*
+                if [[ $REPO_TOOL == git ]]; then
+                    echo "${DI_OUTPUT[$i]}" |
+                        sed "s@,BRANCH} @} -------@;s@/,$REPO_BRANCH@@"
+                else
+                    echo "${DI_OUTPUT[$i]}"
+                fi
             done
             cat << EOF
 
@@ -1071,24 +1078,26 @@ select_repository() {
     # Create menu and list the sbopkg-supported repositories for
     # user to choose from.
 
+    local OLD_REPO_NAME=$REPO_NAME
+    local OLD_REPO_BRANCH=$REPO_BRANCH
+
     while :; do
-        eval dialog --cancel-label "Back" --title \
+        eval dialog --cancel-label "Back" --title '"Repository Selection"' \
-            '"Choose a repository"' \
+            --menu '"$(crunch "You are currently working with the \
-            --menu '"$(crunch "You are currently using sbopkg to browse a \
+            $REPO_DESC. If you would like to work with a different \
-            local copy of the $REPO_DESC.  If you would \
+            one, please select it from the list below. If not, choose \
-            like to change it, please select another repository below or \
+            < Back >.")"' 21 70 11 \
-            press <Back> to go back.")"' 19 60 9 \
             $(
                 for ((i=0; i<${#REPOSITORIES[@]}; i+=$REPOS_FIELDS)); do
-                    echo \"${REPOSITORIES[$((i+1))]} \(${REPOSITORIES[$i]}\)\"
+                    echo \"${REPOSITORIES[$i]} \(${REPOSITORIES[$((i+1))]}\)\"
                     echo \"${REPOSITORIES[$((i+2))]}\"
                 done
             ) 2> $SBOPKGTMP/sbopkg_version_selection
         if [[ $? != 0 ]]; then
             break
         fi
-        eval $(sed 's:^\(.*\) (\(.*\))$:REPO_NAME=\2;REPO_BRANCH=\1:g' \
+        eval $(sed 's:^\(.*\) (\(.*\))$:REPO_NAME=\1;REPO_BRANCH=\2:g' \
-            < $SBOPKGTMP/sbopkg_version_selection)
+            $SBOPKGTMP/sbopkg_version_selection)
         set_repo_vars
         if dir_init; then
             dialog --title "Save this setting?" --defaultno --yesno \
@@ -1107,6 +1116,10 @@ select_repository() {
             echo "REPO_NAME=$REPO_NAME" >> $HOME/.sbopkg.conf
             echo "REPO_BRANCH=$REPO_BRANCH" >> $HOME/.sbopkg.conf
             break
+        else
+            REPO_NAME=$OLD_REPO_NAME
+            REPO_BRANCH=$OLD_REPO_BRANCH
+            set_repo_vars
         fi
     done
     rm -f $SBOPKGTMP/sbopkg_version_selection
@@ -4135,7 +4148,7 @@ utilities_menu() {
             14 69 6 \
             "Cache" "View the contents of the cache directory" \
             "Log" "View the permanent build log" \
-            "Repository" "Select repository [ $REPO_BRANCH ($REPO_NAME) ]" \
+            "Repository" "Select repository [ $REPO_NAME ($REPO_BRANCH) ]" \
             "Latest" "Check for an update to sbopkg"  \
             "Uninstalled packages" "View uninstalled packages" \
             "Obsolete sources" "View obsolete cached sources" 2> $ANSWERFILE
@@ -4660,8 +4673,8 @@ if [[ $VERSION ]]; then
     fi
     if [[ $CUSTOMVER =~ .*/.* ]]; then
         # The user specified repository/branch
-        eval $(sed 's:^\(.*\)/\(.*\)$:REPO_NAME=\1;REPO_BRANCH=\2:g' \
+        REPO_NAME=${CUSTOMVER%/*}
-            <<< $CUSTOMVER)
+        REPO_BRANCH=${CUSTOMVER#*/}
     else
         # The user specified only the branch -- keep the default repository
         REPO_BRANCH=$CUSTOMVER