Changeset 374 for trunk/confman.in

Timestamp:

07/02/2009 14:26:52 (3 years ago)

Author:

blee

Message:

Replacing global variables with functions:

• METADIR -> conf_meta_dir
• RECIPEDIR -> conf_recipe_dir
• RECIPE_PATH -> conf_recipe_path

Also deleted unused variable REPO_VERSION_FILE.

Also removed workarounds in conf_export and conf_revision.

Fixes #35

File:

• trunk/confman.in (modified) (3 diffs)

trunk/confman.in

@@ -876 +876 @@
     local recipe="$1"
     local recipe_file=$(conf_tmp_file)
-    cat "${RECIPEDIR}/${recipe}" > "$recipe_file"
+    cat "$(conf_recipe_dir)/${recipe}" > "$recipe_file"
     $EDITOR "$recipe_file"
     for module in $(conf_get_recipe ${recipe_file}) ; do
@@ -911 +911 @@
     if [ -z "$1" ] ; then print_usage 1 ; fi
     local recipe="$1"
-    if ! [ -f "${RECIPEDIR}/${recipe}" ] ; then
+    if ! [ -f "$(conf_recipe_dir)/${recipe}" ] ; then
         echo "Error: recipe $recipe does not exist. Create it first!" >&2
         exit 1
@@ -921 +921 @@
     if [ -z "$1" ] ; then print_usage 1 ; fi
     local recipe="$1"
-    if ! [ -f "${RECIPEDIR}/${recipe}" ] ; then
+    if ! [ -f "$(conf_recipe_dir)/${recipe}" ] ; then
         echo "Error: recipe $recipe does not exist." >&2
         exit 1
     fi
-    cat "${RECIPEDIR}/${recipe}"
+    cat "$(conf_recipe_dir)/${recipe}"
 }
     
 function recipe_list {
-    cd ${RECIPEDIR}
+    cd $(conf_recipe_dir)
     ls
 }