From f17e5ae4042743328068eff4b2d45cfb02cd4c41 Mon Sep 17 00:00:00 2001
From: slakmagik <slakmagik@18908463-3d48-0410-af50-6b38eb639d31>
Date: Thu, 2 Dec 2010 00:49:26 +0000
Subject: [PATCH] addressed issue 48 (MKDIR_PROMPT ignored)

r819 mostly replaced directory_checks() and ck_dir() with dir_init() but
forgot about the MKDIR_PROMPT variable used in ck_dir(). So again wrapped
the prompting in a conditional based on that setting and moved the
action outside the conditional.
---
 src/usr/sbin/sbopkg | 52 ++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/usr/sbin/sbopkg b/src/usr/sbin/sbopkg
index 0050495..4343c8e 100755
--- a/src/usr/sbin/sbopkg
+++ b/src/usr/sbin/sbopkg
@@ -283,43 +283,43 @@ dir_init() {
         fi
     done
     if [[ ${DI_OUTPUT[*]} ]]; then
-        # Keep DI_OUTPUT_LINES and the 'table headers' aligned, too.
-        cat << EOF
+        if [[ $MKDIR_PROMPT ]]; then
+            # Keep DI_OUTPUT_LINES and the 'table headers' aligned, too.
+            cat << EOF
 
 The following directories do not exist:
 
 Variable               Assignment
 --------               ----------
 EOF
-        for ((i=0; i<${#DI_OUTPUT[*]}; i++)); do
-            echo "${DI_OUTPUT[$i]}"
-        done
-        cat << EOF
+            for ((i=0; i<${#DI_OUTPUT[*]}; i++)); do
+                echo "${DI_OUTPUT[$i]}"
+            done
+            cat << EOF
 
 You can have sbopkg create them or, if these values are incorrect, you can
 abort to edit your config files or pass different flags.
 
 EOF
-        while :; do
-            read $NFLAG -ep "(C)reate or (A)bort?: "
-            case $REPLY in
-                C|c)
-                    if ! mkdir -p $DIRS2MK 2>/dev/null; then
-                        echo "$SCRIPT: failed to create directories" >&2
-                        exit 1
-                    fi
-                    break
-                    ;;
-                A|a)
-                    if [[ ${FUNCNAME[1]} == main ]]; then
-                        exit 1
-                    else
-                        return 1
-                    fi
-                    ;;
-                *) unknown_response ;;
-            esac
-        done
+            while :; do
+                read $NFLAG -ep "(C)reate or (A)bort?: "
+                case $REPLY in
+                    C|c) break ;;
+                    A|a)
+                        if [[ ${FUNCNAME[1]} == main ]]; then
+                            exit 1
+                        else
+                            return 1
+                        fi
+                        ;;
+                    *) unknown_response ;;
+                esac
+            done
+        fi
+        if ! mkdir -p $DIRS2MK 2>/dev/null; then
+            echo "$SCRIPT: failed to create directories" >&2
+            exit 1
+        fi
     fi
 
     for ((i=0; i<${#DIR_VARS[*]}; i++)); do