Changeset 339

Timestamp:

06/22/2009 17:24:12 (3 years ago)

Author:

blee

Message:

• Created function conf_repo_uri to correctly generate the repository URI based on REPO_PROTOCOL
• Removed REPO_URI and REPO_TRUNK global variables
• Replaced all references to REPO_URI and REPO_TRUNK with calls to conf_repo_uri

See #34

Location:

trunk

Files:

• confadmin.in (modified) (1 diff)
• confmanlib.sh.in (modified) (3 diffs)

trunk/confadmin.in

@@ -52 +52 @@
     local dir dirs
     local msg="Initial confman directory setup." 
-    if @SVN@ ls "${REPO_URI}/trunk/checkpoints" >/dev/null 2>&1 ; then
+    if @SVN@ ls "`conf_repo_uri`/trunk/checkpoints" >/dev/null 2>&1 ; then
         echo "It looks like this repository has already been setup." >&2
         exit 1
     fi
     for dir in ${short_dirs} ; do
-        dirs="${dirs} ${REPO_URI}/${dir}"
+        dirs="${dirs} `conf_repo_uri`/${dir}"
     done
     @SVN@ mkdir -m "$msg" ${dirs}

trunk/confmanlib.sh.in

@@ -27 +27 @@
 # This file provides shell libraries to confman
 
-REPO_URI="${REPO_PROTOCOL}${REPO_HOSTNAME}${REPO_PATH}"
-REPO_TRUNK="${REPO_PROTOCOL}${REPO_HOSTNAME}${REPO_PATH}/trunk"
 REPO_ACTION="${REPO_DB}/last_action"
 REPO_SYNC_STATE="${REPO_DB}/state"
@@ -40 +38 @@
 REPO_VERSION="2"
 REPO_VERSION_FILE="${METADIR}/rversion"
+
+# Prints the repository URI
+function conf_repo_uri {
+        local uri
+
+        case ${REPO_PROTOCOL} in
+                file)
+                        uri="${REPO_PROTOCOL}${REPO_PATH}"
+                        ;;
+                *)
+                        uri="${REPO_PROTOCOL}${REPO_HOSTNAME}${REPO_PATH}"
+                        ;;
+        esac
+
+        echo $uri
+}
 
 # Checks out the conf tree if we don't already have it. Updates it if we do.
@@ -52 +66 @@
         chmod 700 ${WORK_PATH}
         
-        @SVN@ checkout ${REPO_TRUNK} ${WORK_PATH}
+        @SVN@ checkout `conf_repo_uri`/trunk ${WORK_PATH}
         else
         @SVN@ update ${WORK_PATH}