Changeset 501 for trunk/confman.in

Timestamp:

11/12/2009 21:26:37 (2 years ago)

Author:

ccowart

Message:

Allowing confman recipe edit to be used with no arguments. Also
fixing the lack of error checking on existence of a recipe to be
edited.

Fixes #105

File:

• trunk/confman.in (modified) (1 diff)

trunk/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)