Changeset 120 for trunk/confman/confmanlib.sh

Timestamp:

12/04/2006 01:32:20 (5 years ago)

Author:

ccowart

Message:

Modularized some parts of confman for reuse. Used these elements in the
new roll-and-pull features available.

File:

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

trunk/confman/confmanlib.sh

@@ -55 +55 @@
 # Commits module $1 with message $2
 function conf_commit {
-        local module=$1
+        local modules=$(echo $modules | tr ' ' ',')
         local msg="$2"
-        svn commit -F "$msg" ${WORK_PATH}/$module
+
+    # $modules is in the form foo,bar,baz. This eval trick forces
+    # curly brace expansion.
+        svn commit -F "$msg" $(eval echo foo/{$modules})
+}
+
+function conf_fetch {
+    local tmpfile=`mktemp -t confman`
+    local proto="${CONF_EXPORT_URI%:/*}"
+    local remote
+
+    case $proto in
+        sftp|scp)   
+            remote="${CONF_EXPORT_URI#*://}"
+            remote="${remote/\//:/}"
+            scp $remote $tmpfile 
+            ;;
+        http|https|ftp)
+            fetch -o $tmpfile $remote
+            ;;
+        file)
+            remote="${CONF_EXPORT_URI#*://}"
+            cp $remote $tmpfile
+            ;;
+        *)
+            echo "Unsupported Protocol in conf_fetch" >&2
+            return 1
+            ;;
+    esac
+    echo $tmpfile
+    return 0
 }
 
@@ -63 +93 @@
 function conf_status {
         svn status $*
+}
+
+# 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"
 }
 
@@ -400 +439 @@
 }
 
+# Accepts log messages on stdin until EOF
+function conf_logger {
+   cat | logger -t "$MYNAME[$$]: $USER" -s
+}
+
 # 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!
@@ -405 +449 @@
 # process, which is receiving its input from our fd 2.
 function conf_cleanexit {
+    echo "Confman received a signal. Exiting cleanly." | conf_logger
         echo "Abort, Abort! Patience is a virtue." >&4
         echo "Please wait until I finish cleaning up after you." >&4
-
-        echo "Removing leftover temp files..." >&4
-        find /tmp -maxdepth 1 -user `whoami` -name 'confman*' -exec rm -f {} \;
 
         # And in case we got an interrupt during a rollout, we still want the
@@ -415 +457 @@
         chmod 700 ${WORK_PATH}
 
+        echo "Removing leftover temp files..." >&4
+        find /tmp -maxdepth 1 -user `whoami` -name 'confman*' -exec rm -rf {} \;
+
         # And this clears any locks we may have created on our working copy:
         echo "Undoing damage to your working copy..." >&4
-        svn cleanup ${WORK_PATH}
+        [ -d "${WORK_PATH}" ] && svn cleanup ${WORK_PATH}
         echo "All clean. Terminating." >&4