Changeset 487 for branches/confman-1.9/confmanlib.sh.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)
• confmanlib.sh.in (modified) (1 diff)

branches/confman-1.9/confmanlib.sh.in

@@ -839 +839 @@
 
 function conf_rename {
-        local oldmod=$1
-        local newmod=$2
-        local file
-
-        # First, we perform the easy operations
-        @SVN@ mv ${WORK_PATH}/${oldmod} ${WORK_PATH}/${newmod} || \
-                {       echo "There was a problem renaming the modules." >&4 ; \
-                        conf_cleanExit 1 
-                }
-        @SVN@ mv ${WORK_PATH}/${REPO_CHECKPTS}/${oldmod} \
-                        ${WORK_PATH}/${REPO_CHECKPTS}/${newmod} || \
-                {       echo "There was a problem renaming the checkpts." >&4 ; \
-                        conf_cleanExit 1 
-                }
-
-        @SVN@ update ${WORK_PATH} || \
-                {       echo "Your working copy didn't update correctly." >&4 ; \
-                        conf_cleanExit 1 
-                }
-        @SVN@ commit -m "Renaming ${oldmod} to ${newmod}, phase 1." \
-                ${WORK_PATH}/{,${REPO_CHECKPTS}}/{${oldmod},${newmod}} || \
-                {       echo "Committing the changes failed." >&4 ; conf_cleanExit 1 
-                }
-
-        # Next, we have to rename any singularities
-        for file in ${SINGULARITIES} ; do
-                if [ -f "${WORK_PATH}/${newmod}${file}-${oldmod}" ] ; then
-                        @SVN@ mv ${WORK_PATH}/${newmod}${file}-${oldmod} \
-                                        ${WORK_PATH}/${newmod}${file}-${newmod}
-                fi
-        done
-
-        @SVN@ update ${WORK_PATH} || \
-                {       echo "Your working copy didn't update correctly." >&4 ; \
-                        conf_cleanExit 1 
-                }
-        @SVN@ commit -m "Renaming ${oldmod} to ${newmod}, phase 2." \
-                ${WORK_PATH}/${newmod} || \
-                {       echo "Committing the changes failed." >&4 ; conf_cleanExit 1 
-                }
-
-        # Now, we have to go fix all the confman headers in all the files...
-        find ${WORK_PATH}/${newmod} -type f -not -path '*/.svn/*' -exec \
-                ${sed_cmd} -i -r \
-        "s/^(# Managed under )${oldmod}( module)/\1${newmod}\2/" {} \;
-        
-        @SVN@ update ${WORK_PATH} || \
-                {       echo "Your working copy didn't update correctly." >&4 ; \
-                        conf_cleanExit 1 
-                }
-        @SVN@ commit -m "Renaming ${oldmod} to ${newmod}, complete." \
-                ${WORK_PATH}/${newmod} || \
-                {       echo "Committing the changes failed." >&4 ; conf_cleanExit 1 
-                }
+    local oldmod=$1
+    local newmod=$2
+    local file
+
+    @SVN@ mv ${WORK_PATH}/${oldmod} ${WORK_PATH}/${newmod} || return 1
+    @SVN@ mv ${WORK_PATH}/${REPO_CHECKPTS}/${oldmod} \
+        ${WORK_PATH}/${REPO_CHECKPTS}/${newmod} || return 1
+
+    for file in ${SINGULARITIES} ; do
+        if [ -f ${WORK_PATH}/${newmod}${file}-${oldmod} ]; then
+            @SVN@ mv ${WORK_PATH}/${newmod}${file}-${oldmod} \
+                ${WORK_PATH}/${newmod}${file}-${newmod} || return 1
+        fi
+    done
+
+    find ${WORK_PATH}/${newmod} -type f -not -path '*/.svn/*' -exec \
+        ${sed_cmd} -i"" \
+        "s/(Managed under )${oldmod}( module\.)$/\1${newmod}\2/" {} \; \
+        || return 1
+
+    @SVN@ commit -m "Renaming ${oldmod} to ${newmod}" \
+        ${WORK_PATH}/${oldmod} ${WORK_PATH}/${REPO_CHECKPTS}/${oldmod} \
+        ${WORK_PATH}/${newmod} ${WORK_PATH}/${REPO_CHECKPTS}/${newmod} \
+        || return 1
+
+    return 0
 }