Changeset 39 for confman/confman

Timestamp:

03/29/2006 13:55:13 (6 years ago)

Author:

ccowart

Message:

Fixed up the handling of paths for making new directories.

File:

• confman/confman (modified) (2 diffs)

confman/confman

@@ -537 +537 @@
 function newdir {
         local dir=$1
-        local response 
+        local response module realpath
         local mode=$DEFAULT_MODE
         local owner=$DEFAULT_OWNER
         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
@@ -550 +548 @@
 
         # Find the "real" directory's path
-        dir="${workdir}/${dir}"
-        echo $dir
-        local module=`echo ${workdir#$WORK_PATH/} | sed -E 's:/([^/]+)/.*:\1:'`
-        echo $module
-        local realpath=${dir#${WORK_PATH}/${module}}
-        echo $realpath
+        if [[ ! $dir =~ "^\/" ]] ; then
+                dir="${workdir}/${dir}"
+        fi
+        module=`echo ${dir#$WORK_PATH} | sed -E 's:/([^/]+)/.*:\1:'`
+        realpath=${dir#${WORK_PATH}/${module}}
 
         if [ -d $realpath ] ; then