Changeset 463 for trunk

Timestamp:

10/10/2009 10:41:02 (3 years ago)

Author:

ccowart

Message:

Updated confman recipe print with no arguments to print the
host's current recipe.

Needs to be merged into 1.9.

See #85.

Location:

trunk

Files:

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

trunk/confman.8.in

@@ -208 +208 @@
 .It Cm recipe 
 .Brq Cm get | list
-.It Cm recipe 
-.Brq Cm create [ Fl R Ar filename ] | Cm edit | print | remove | set 
-.Ar recipe 
+.It Cm recipe create Oo Fl R Ar filename Oc Ar recipe
+.It Cm recipe print Oo Ar recipe Oc
+.It Cm recipe Bro Cm edit | remove | set Brc Ar recipe 
 .Bl -tag -width indent
 .It Cm create
@@ -222 +222 @@
 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 

trunk/confman.in

@@ -1026 +1026 @@
 
 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}"
 }

trunk/confmandoc.sh

@@ -501 +501 @@
 Usage:
   $MYNAME recipe [ get | list ]
+  $MYNAME recipe print [ recipe_name ]
   $MYNAME recipe [ create | edit | print | remove | set ] recipe_name
 
@@ -507 +508 @@
     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