Changeset 502

Timestamp:

11/12/2009 21:27:51 (2 years ago)

Author:

ccowart

Message:

Merging enhancements to confman recipe edit.

Resolves #105

Location:

branches/confman-1.9

Files:

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

branches/confman-1.9/confman.8.in

@@ -220 +220 @@
 .It Cm recipe create Oo Fl R Ar filename Oc Oo Ar log_flags Oc 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 edit Oo Ar log_flags Oc Oo Ar recipe Oc
+.It Cm recipe Bro Cm remove Brc Oo Ar log_flags Oc Ar recipe 
 .It Cm recipe set Ar recipe
 .Bl -tag -width indent

branches/confman-1.9/confman.in

@@ -966 +966 @@
     shift $(($OPTIND - 1))
 
-    if [ -z "$1" ] ; then print_usage 1 ; fi
-
-    wcopy_lock=$(conf_lock_wcopy)
-    recipe="$1"
+    if [ -z "$1" ] ; then 
+        conf_require_recipe
+        recipe=$(conf_get_recipe_name)
+    else
+        recipe="$1"
+    fi
+
+    wcopy_lock=$(conf_lock_wcopy)
     recipe_file=$(conf_recipe_dir)/${recipe}
+
+    if ! [ -f "$recipe_file" ] ; then
+        echo "Recipe $recipe does not exist." >&4
+        exit 1
+    fi
+
     new_recipe_file=$(conf_tmp_file)
 

branches/confman-1.9/confmandoc.sh

@@ -501 +501 @@
 Usage:
   $MYNAME recipe [ get | list ]
-  $MYNAME recipe print [ recipe_name ]
+  $MYNAME recipe [ print | edit ] [ recipe_name ]
   $MYNAME recipe set recipe_name
-  $MYNAME recipe [ create | edit | remove ] [ -F file | -m msg ] recipe_name
+  $MYNAME recipe [ create | remove ] [ -F file | -m msg ] recipe_name
 
 The recipe command provides an interface to manage confman recipes.