Changeset 38

Timestamp:

03/29/2006 02:54:10 (6 years ago)

Author:

ccowart

Message:

/almost/ release-worthy.

Location:

confman

Files:

• confman (modified) (3 diffs)
• confman.conf (modified) (4 diffs)

confman/confman

@@ -520 +520 @@
 
         if [ ! -d "${WORK_PATH}/${module}`dirname $file`" ] ; then
-                newdir $module `dirname $file` 
+                newdir "${WORK_PATH}/${module}`dirname $file`"
         fi
 
@@ -542 +542 @@
         local group=$DEFAULT_GROUP
         local comment="dir"
+        # Ugh. This doesn't work when the function is called from import...
+        # It assumes we're working in the working copy...
         local workdir=`abspath .`
         if [ -z $1 ] ; then
@@ -549 +551 @@
         # Find the "real" directory's path
         dir="${workdir}/${dir}"
+        echo $dir
         local module=`echo ${workdir#$WORK_PATH/} | sed -E 's:/([^/]+)/.*:\1:'`
         echo $module

confman/confman.conf

@@ -5 +5 @@
 
 # The location of our shell library
-# REPO_LIBRARY="/usr/local/rescomp/lib/confmanlib.sh"
-REPO_LIBRARY="/home/ccowart/src/confman/confmanlib.sh"
+REPO_LIBRARY="/usr/local/rescomp/lib/confmanlib.sh"
 
 # The protocol to use for contacting our repository:
@@ -15 +14 @@
 
 # The path on the remote host to find the repository:
-REPO_PATH="/usr/local/rescomp/repo/conf-two"
+REPO_PATH="/usr/local/rescomp/repo/conf"
 
 # The directory from the root of the repository to rescomp core:
@@ -27 +26 @@
 
 # Where to keep our "working copy" of the system:
-WORK_PATH="${HOME}/test3/src/conf"
+WORK_PATH="${HOME}/src/conf"
 
 # The path to our current host's recipe file
@@ -49 +48 @@
 # want to use a prefix. Useful for testing confman, by having files installed
 # into an arbitrary system root, instead of the actual system.
-LIVE_ROOT="/home/ccowart/img"
+#LIVE_ROOT="/home/ccowart/img"