Rework the options selection menu to avoid truncating the options.

Without this patch, the list of build options was placed on the
left side of a menu dialog entry. Since dialog entries cannot span
to multiple lines, very long option lists were (visually) truncated.
Rework the dialog to show the options in the menu text field, so
there's much more room for them.
Reported by Erik Hanson.

While at it, also make sure that there's no stale options.build
file lying around (which is a minor bugfix).

Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>

ChangeLog-current.txt

@@ -31,4 +31,6 @@ enhancements:
   * Add a dialog and cli option to show all READMEs for the queued packages.
     This can come handy to do "final checks" on the active queue before
     starting the build process.
+  * Reworked the options selection menu to avoid seeing only a truncated set
+    of the actual options.
 +--------------------------+

src/usr/sbin/sbopkg

@@ -3305,7 +3305,7 @@ pick_file() {
                 dialog --title "Choose $PKG $FILE file" --menu \
                     "$(crunch "A local $FILE file for $PKG was found in \
                     addition to the original file. Which one \
-                    would you like to use?")" 11 60 3 \
+                    would you like to use?")" 12 60 3 \
                     "Local" "Use the local $FILE" \
                     "Original" "Use the original $FILE" \
                     "Diff" "View a diff of the two" \
@@ -3387,7 +3387,7 @@ use_options() {
     local OPTAPP=$2
     local OPTCHOICE=$SBOPKGTMP/sbopkg_options_choice
     local OPTLIST=$SBOPKGTMP/sbopkg_options_list
-    local TMPOPTIONS LDOPTIONS CHOICE
+    local TMPOPTIONS LDOPTIONS CHOICE OPTIONS_MSG
 
     # By default (i.e. no options.sbopkg file) there are no build options.
     unset BUILDOPTIONS
@@ -3397,33 +3397,38 @@ use_options() {
     if [[ -f $SBOPKGTMP/sbopkg_"$OPTAPP"_loadoptions ]]; then
         LDOPTIONS=$(< $SBOPKGTMP/sbopkg_"$OPTAPP"_loadoptions)
     fi
+    rm -f $PKGPATH/options.build
     if [[ $TMPOPTIONS || $LDOPTIONS ]]; then
         if [[ $DIAG ]]; then
             rm -f $OPTLIST $OPTCHOICE
-            echo "None \"Build with no options\"" >> $OPTLIST
+            echo 'None "Build with no options"' >> $OPTLIST
             if [[ $TMPOPTIONS ]]; then
-                echo "\"$TMPOPTIONS\" \"Saved options\"" >> $OPTLIST
+                echo 'Saved "Build with your saved options"' >> $OPTLIST
+                OPTIONS_MSG="\nSaved options:\n$TMPOPTIONS\n"
             fi
             if [[ $LDOPTIONS ]]; then
-                echo "\"$LDOPTIONS\" \"Queuefile options\"" >> $OPTLIST
+                echo 'Queuefile "Build with the queuefile options"' \
+                    >> $OPTLIST
+                OPTIONS_MSG+="\nQueuefile options:\n$LDOPTIONS\n"
             fi
-            dialog --title "Build options" --menu "$(crunch "One or \
+            dialog --title 'Build options' --menu "$(crunch "One or \
                 more build option files for the $OPTAPP \
-                SlackBuild were found.  Please choose which you \
+                SlackBuild were found.\n$OPTIONS_MSG\nPlease choose \
-                would like to use.")" 12 50 3 \
+                whether to use them.")" 0 0 0 \
                 --file $OPTLIST 2> $OPTCHOICE
             CHOICE=$?
             if [[ $CHOICE != 0 ]]; then
                 rm -f $OPTLIST $OPTCHOICE
                 return 1
             else
-                if [[ $(< $OPTCHOICE) == "None" ]]; then
+                if [[ $(< $OPTCHOICE) == 'Saved' ]]; then
-                    rm -f $OPTLIST $OPTCHOICE
+                    echo "$TMPOPTIONS" > $PKGPATH/options.build
-                else
+                    BUILDOPTIONS="$TMPOPTIONS"
-                    cp "$OPTCHOICE" $PKGPATH/options.build
+                elif [[ $(< $OPTCHOICE) == 'Queuefile' ]]; then
-                    BUILDOPTIONS=$(< "$OPTCHOICE")
+                    echo "$LDOPTIONS" > $PKGPATH/options.build
-                    rm -f $OPTLIST $OPTCHOICE
+                    BUILDOPTIONS="$LDOPTIONS"
                 fi
+                rm -f $OPTLIST $OPTCHOICE
              fi
         else
             while :; do