Changeset 123 for trunk/confman/confmanlib.sh

Timestamp:

12/04/2006 20:38:36 (5 years ago)

Author:

ccowart

Message:

Developed the pull mechanism for confman. It's ready to go into production!

File:

• trunk/confman/confmanlib.sh (modified) (9 diffs)

trunk/confman/confmanlib.sh

@@ -10 +10 @@
 
 REPO_URI="${REPO_PROTOCOL}${REPO_HOSTNAME}${REPO_PATH}"
+REPO_ACTION="${REPO_DB}/last_action"
+REPO_SYNC_STATE="${REPO_DB}/state"
 
 # Checks out the conf tree if we don't already have it. Updates it if we do.
@@ -55 +57 @@
 # Commits module $1 with message $2
 function conf_commit {
-        local modules=$(echo $modules | tr ' ' ',')
+        local modules=$(echo $1 | tr ' ' ',')
         local msg="$2"
 
     # $modules is in the form foo,bar,baz. This eval trick forces
     # curly brace expansion.
-        svn commit -F "$msg" $(eval echo foo/{$modules})
+    if echo "$modules" | grep ',' > /dev/null ; then
+            svn commit -F "$msg" $(eval echo ${WORK_PATH}/{$modules})
+    else
+        svn commit -F "$msg" ${WORK_PATH}/$modules
+    fi
 }
 
@@ -72 +78 @@
             remote="${CONF_EXPORT_URI#*://}"
             remote="${remote/\//:/}"
-            scp $remote $tmpfile 
+            scp -p $remote $tmpfile 
             ;;
         http|https|ftp)
@@ -79 +85 @@
         file)
             remote="${CONF_EXPORT_URI#*://}"
-            cp $remote $tmpfile
+            cp -p $remote $tmpfile
             ;;
         *)
@@ -97 +103 @@
 # This exports a working copy of the repository to a tarball
 function conf_export {
-    local tmpdir=`mktemp -d -t confman`
     local tarball="$1"
-    svn checkout "${REPO_URI}" "${tmpdir}/conf"
-    tar -czf "$tarball" -C "$tmpdir" conf
-    rm -rf "$tmpdir"
+    conf_checkout_tree
+    tar -czf "$tarball" -C "${WORK_PATH}" .
 }
 
@@ -159 +163 @@
         # See if it even exists
         file="${moduledir}${livefile}"
-        echo Install: $file
         if [ ! -e "$file" ] && [ -z "$1" ] ; then
                 return 0
@@ -240 +243 @@
         local checkpoint=$2
         local chkpath="${WORK_PATH}/${REPO_CHECKPTS}/${module}/${checkpoint}"
-        local revision=`svn info ${WORK_PATH}|awk '/Last Changed Rev:/ {print $4}'`
+        local revision=`conf_revision`
         echo $revision > $chkpath
         svn add $chkpath
@@ -470 +473 @@
 }
 
+function conf_markclean {
+    echo clean > $REPO_SYNC_STATE
+}
+
+function conf_markdirty {
+    echo dirty > $REPO_SYNC_STATE
+}
+
+function conf_isclean {
+    local state=`cat $REPO_SYNC_STATE`
+    case $state in
+        clean)  return 0 ;;
+        dirty)  return 1 ;;
+        *)      echo "Invalid state. Reporting dirty." >&2 ; return 1 ;;
+    esac
+}
+
+# Returns the current revision number of the repository on stdout
+function conf_revision {
+    svn info ${WORK_PATH} | awk '/Last Changed Rev:/ {print $4}'
+}
+
+# Returns the revision of the last commit or install operation on stdout
+function conf_sysrev {
+    cut -d ':' -f 2 $REPO_ACTION
+}
+
+# Returns the last action of the repository on stdout
+function conf_lastact {
+    cut -d ':' -f 1 $REPO_ACTION
+}
+
+# Records the specified action
+function conf_recordAction {
+    local action="$1"
+    local revision=`conf_revision`
+    echo "${action}:${revision}" > $REPO_ACTION
+}
+
 # WARNING: If you refer to fd 2 in this code, this function will silently
 # fail when called by trap. DO NOT ATTEMPT TO LOG TO fd 2 IN THIS FUNCTION!
@@ -484 +526 @@
 
         echo "Removing leftover temp files..." >&4
-        find /tmp -maxdepth 1 -user `whoami` -name 'confman*' -exec rm -rf {} \;
+        find /tmp/confman* -maxdepth 0 -user `whoami` -exec rm -rf {} \;
 
         # And this clears any locks we may have created on our working copy: