Changeset 482 for branches/confman-1.9

Timestamp:

11/11/2009 14:15:28 (2 years ago)

Author:

ccowart

Message:

Merging support for recipe print with no arguments from trunk.

Resolves #85

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• confman.8.in (modified) (2 diffs)
• confman.in (modified) (1 diff)
• confmandoc.sh (modified) (2 diffs)

branches/confman-1.9/confman.8.in

@@ -219 +219 @@
 .Brq Cm get | list
 .It Cm recipe create Oo Fl R Ar filename Oc Oo Ar log_flags Oc Ar recipe
-.It Cm recipe print Ar recipe
+.It Cm recipe print Oo Ar recipe Oc
 .It Cm recipe Bro Cm edit | remove Brc Oo Ar log_flags Oc Ar recipe 
 .It Cm recipe set Ar recipe
@@ -233 +233 @@
 in a text editor
 .It Cm get
-Print the host's current recipe
+Print the name of the host's current recipe
 .It Cm list
 List all recipes
 .It Cm print
 Display the contents of
-.Ar recipe
+.Ar recipe .
+Defaults to the host's current recipe.
 .It Cm remove
 Delete 

branches/confman-1.9/confman.in

@@ -1103 +1103 @@
 
 function recipe_print {
-    if [ -z "$1" ] ; then print_usage 1 ; fi
     local recipe="$1"
+
+    if [ -z "$recipe" ] ; then
+        recipe=$(conf_get_recipe_name)
+    fi
+
     if ! [ -f "$(conf_recipe_dir)/${recipe}" ] ; then
         echo "Error: recipe $recipe does not exist." >&2
         exit 1
     fi
+
     cat "$(conf_recipe_dir)/${recipe}"
 }

branches/confman-1.9/confmandoc.sh

@@ -501 +501 @@
 Usage:
   $MYNAME recipe [ get | list ]
+  $MYNAME recipe print [ recipe_name ]
   $MYNAME recipe set recipe_name
   $MYNAME recipe [ create | edit | remove ] [ -F file | -m msg ] recipe_name
@@ -508 +509 @@
     create      Create a recipe with the given name
     edit        Edit a recipe with the given name
-    get         Print the host's recipe
+    get         List the host's recipe
     list        List all recipes
-    print       Print the given recipe
+    print       Print the given recipe (defaults to this host's recipe)
     remove      Delete a recipe with the given name
     set         Set the host's recipe to the given name