Changeset 487 for branches/confman-1.9/confman.in

Timestamp:

11/11/2009 14:27:08 (3 years ago)

Author:

ccowart

Message:

Merging rename and sed cleanups from trunk.

Resolves #97, #98

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• confman.in (modified) (1 diff)

branches/confman-1.9/confman.in

@@ -787 +787 @@
     local oldmod=$1
     local newmod=$2
-    local wcopy_lock
-    if [ -z $newmod ] ; then
+    local dir
+    local wcopy_lock
+    if [ -z "$oldmod" -o -z "$newmod" ]; then
         print_usage 1
     fi
-    if [ ! -d "${WORK_PATH}/${oldmod}" ] ; then
-        echo "${MYNAME}: Error: ${WORK_PATH}/${oldmod} doesn't exist" >&4
-        conf_cleanExit
-    fi
-    if [ -e "${WORK_PATH}/${newmod}" ] ; then
-        echo "${MYNAME}: Error: ${WORK_PATH}/${newmod}: file exists" >&4
-        conf_cleanExit
-    fi
-    wcopy_lock=$(conf_lock_wcopy)
-    conf_rename $oldmod $newmod
+    wcopy_lock=$(conf_lock_wcopy)
+    conf_update_tree || exit 1
+    for dir in ${WORK_PATH}/{,${REPO_CHECKPTS}/}$oldmod; do
+        if ! [ -d "$dir" ]; then
+            echo "No such directory: $dir" >&4
+            exit 1
+        fi
+    done
+    for dir in ${WORK_PATH}/{,${REPO_CHECKPTS}/}$newmod; do
+        if [ -e "$dir" ]; then
+            echo "Directory already exists: $dir" >&4
+            exit 1
+        fi
+    done
+    conf_rename $oldmod $newmod || exit 1
     conf_unlock_wcopy $wcopy_lock
 }