Changeset 375 for branches

Timestamp:

07/02/2009 14:45:11 (3 years ago)

Author:

blee

Message:

Merging migration of global variables to functions from trunk.

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• abspath.in (modified) (1 prop)
• conflock.in (modified) (1 prop)
• confman.in (modified) (3 diffs)
• confmanlib.sh.in (modified) (8 diffs, 1 prop)

branches/confman-1.9/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
 }

branches/confman-1.9/confmanlib.sh.in

@@ -29 +29 @@
 REPO_ACTION="${REPO_DB}/last_action"
 REPO_SYNC_STATE="${REPO_DB}/state"
-WCLOCKFILE="${WORK_PATH}/confman.lock"
-METADIR="${WORK_PATH}/meta"
-RECIPEDIR="${METADIR}/recipes"
 RECIPE_NAME="$(cat "$RECIPE_FILE" 2>/dev/null)"
-RECIPE_PATH="${RECIPEDIR}/${RECIPE_NAME}"
 
 VERSION="1.9.a"
 REPO_VERSION="2"
-REPO_VERSION_FILE="${METADIR}/rversion"
 
 # Prints the repository URI
@@ -54 +49 @@
 
         echo $uri
+}
+
+function conf_meta_dir {
+    echo "${WORK_PATH}/meta"
+}
+
+function conf_recipe_dir {
+    echo "$(conf_meta_dir)/recipes"
+}
+
+function conf_recipe_path {
+    echo "$(conf_recipe_dir)/${RECIPE_NAME}"
 }
 
@@ -85 +92 @@
 
 # Functions for locking and unlocking both the system and the working copy
+function conf_wcopy_lockfile {
+    echo "${WORK_PATH}/confman.lock"
+}
+
 function conf_lock_wcopy {
-    ${LOCK} lock $$ "$WCLOCKFILE" || exit 1
+    ${LOCK} lock $$ $(conf_wcopy_lockfile) || exit 1
 }
 
 function conf_unlock_wcopy {
-    ${LOCK} unlock $$ "$WCLOCKFILE"
+    ${LOCK} unlock $$ $(conf_wcopy_lockfile)
 }
 
 function conf_wcopy_is_locked {
-    ${LOCK} haslock $$ "$WCLOCKFILE"
+    ${LOCK} haslock $$ $(conf_wcopy_lockfile)
 }
 
@@ -253 +264 @@
             ;;
         recipe)
-            RECIPEDIR="${WORK_PATH}/meta/recipes" # until ticket #35 is resolved
-            for recipefile in ${RECIPEDIR}/*; do
+            for recipefile in $(conf_recipe_dir)/*; do
                 modules="meta $(conf_get_recipe $recipefile)"
-                tar -czf "$exportpath/${recipefile#$RECIPEDIR/}.tgz" -C "${WORK_PATH}" $modules
+                tar -czf "$exportpath/${recipefile#$(conf_recipe_dir)/}.tgz" -C "${WORK_PATH}" $modules
             done
             ;;
@@ -755 +765 @@
 # Returns the current revision number of the repository on stdout
 function conf_revision {
-    METADIR="${WORK_PATH}/meta" # until ticket #35 is resolved
-    @SVN@ info ${METADIR} | awk '/Last Changed Rev:/ {print $4}'
+    @SVN@ info $(conf_meta_dir) | awk '/Last Changed Rev:/ {print $4}'
 }
 
@@ -782 +791 @@
 
     if [ -z "$recipe" ] ; then
-        recipe_file="$RECIPE_PATH"
+        recipe_file="$(conf_recipe_path)"
     fi
 
@@ -812 +821 @@
 function conf_recipe_create {
     local recipe="$1"
-    local recipe_file="${RECIPEDIR}/${recipe}"
+    local recipe_file="$(conf_recipe_dir)/${recipe}"
     if [ -f "${recipe_file}" ] ; then
         echo "Recipe $recipe already exists!" >&2
@@ -824 +833 @@
     local recipe="$1"
     local recipe_file="$2"
-    cat "$recipe_file" > "${RECIPEDIR}/${recipe}"
-    @SVN@ commit "${RECIPEDIR}/${recipe}"
+    cat "$recipe_file" > "$(conf_recipe_dir)/${recipe}"
+    @SVN@ commit "$(conf_recipe_dir)/${recipe}"
 }
 
 function conf_remove_recipe {
     local recipe="$1"
-    local recipe_file="${RECIPEDIR}/${recipe}"
+    local recipe_file="$(conf_recipe_dir)/${recipe}"
     if ! [ -f "${recipe_file}" ] ; then
         echo "Recipe $recipe doesn't exist!" >&2