Changeset 481 for branches/confman-1.9/confmanlib.sh.in

Timestamp:

11/11/2009 14:09:39 (3 years ago)

Author:

ccowart

Message:

Merging improved recipe creation and editing from trunk.

Resolves #83, #84

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• confmanlib.sh.in (modified) (5 diffs)

branches/confman-1.9/confmanlib.sh.in

@@ -32 +32 @@
 WCOPY_DIRTY="false"
 CONF_EXPORT="false"
+LOG_MESSAGE_SET="false"
 
 VERSION='@VERSION@'
@@ -698 +699 @@
 
 function conf_rm_file {
-        @SVN@ rm $*
+        @SVN@ rm "$@"
 }
 
@@ -963 +964 @@
         return 1
     fi
-    touch "$recipe_file"
+    ${sed_cmd} -e "s:__NAME__:${recipe}:" $RECIPE_TEMPLATE > "$recipe_file"
     @SVN@ add "$recipe_file"
 }
 
-function conf_update_recipe {
-    local recipe="$1"
-    local recipe_file="$2"
-    cat "$recipe_file" > "$(conf_recipe_dir)/${recipe}"
-    @SVN@ commit "$(conf_recipe_dir)/${recipe}"
+function conf_recipe_verify {
+    local recipe_file="$1"
+    local module
+    for module in $(conf_get_recipe ${recipe_file}) ; do
+        if ! [ -d "${WORK_PATH}/${module}" ] ; then
+            echo "Error: recipe references non-existent module $module" >&2
+            return 1
+        fi
+    done
+    return 0
+}
+
+function conf_commit_recipes {
+    local recipe recipes
+
+    local logfile="$1"
+    shift
+
+    for recipe in "$@" ; do
+        recipes="${recipes:+${recipes} }$(conf_recipe_dir)/${recipe}"
+    done
+
+    @SVN@ commit -F "$logfile" $recipes
 }
 
 function conf_remove_recipes {
-    local recipe
+    local recipe recipe_file
     local oldrecipes
     local rc=0
@@ -981 +1000 @@
     for recipe in "$@"; do
         if conf_remove_recipe "$recipe"; then
-            # Keep track of the recipes that were successfully removed
-            # to avoid inadvertent commits
-            if [ -z "$oldrecipes" ]; then
-                oldrecipes="$recipe"
-            else
-                oldrecipes="$oldrecipes,$recipe"
-            fi
+            recipe_file="$(conf_recipe_dir)/${recipe}"
+            oldrecipes="${oldrecipes:+${oldrecipes} }${recipe_file}"
         else
             rc=1
         fi
     done
-
-    # $oldrecipes is in the form foo,bar,baz. This eval trick forces
-    # curly brace expansion.
-    if echo "$oldrecipes" | grep -q ','; then
-        @SVN@ commit $(eval echo $(conf_recipe_dir)/{$oldrecipes}) 
-    else
-        @SVN@ commit "$(conf_recipe_dir)/$oldrecipes"
-    fi
 
     return $rc
@@ -1012 +1018 @@
     fi
     @SVN@ rm "${recipe_file}" || return 1
+    return 0
+}
+
+# Implements logic for selecting logfile based on -m/-F or interactive mode
+#   Returns 0 if the log is "complete", 1 if the log needs editing
+#   Prints filename containing the log on stdout
+function conf_log_message {
+    local logfile
+
+    if [ -n "$LOG_FILE" ] ; then
+        echo "$LOG_FILE"
+        return 0
+    fi
+    
+    logfile=$(conf_tmp_file)
+    echo "$logfile"
+
+    if $LOG_MESSAGE_SET ; then
+        echo "$LOG_MESSAGE" > "$logfile"
+    else
+        cat "$LOG_TEMPLATE" > "$logfile"
+        return 1
+    fi
     return 0
 }