Changeset 177 for tags/confman-1.5.5a/confmanlib.sh

Timestamp:

10/08/2007 17:12:27 (5 years ago)

Author:

arjun

Message:

Commiting 1.5.5a

File:

• tags/confman-1.5.5a/confmanlib.sh (modified) (8 diffs)

tags/confman-1.5.5a/confmanlib.sh

@@ -15 +15 @@
 # Checks out the conf tree if we don't already have it. Updates it if we do.
 function conf_checkout_tree {
-        if [ ! -d ${WORK_PATH} ] ; then
+        if [ ! -d ${WORK_PATH}/.svn ] ; then
                         local path=`echo ${WORK_PATH} | sed -E 's:/[^/]+$::'`
                         mkdir -p ${WORK_PATH}
@@ -39 +39 @@
 function conf_update_tree {
         svn update ${WORK_PATH}
+}
+
+function conf_setup_lock {
+    if [ -f ${WORK_PATH}/confman.lock ]
+    then
+        return 1
+    else
+        touch ${WORK_PATH}/confman.lock
+        echo $$ > "${WORK_PATH}/confman.lock" #Send PID to the lock to allow for recursive calls
+        return 0
+    fi
+}
+
+function conf_lock_wcopy {
+    if [ ! -d ${WORK_PATH}/.svn ]
+    then
+        echo "${WORK_PATH} is not a valid svn working copy or does not exist." >&4
+        exit 1
+    fi
+    if [ -f ${WORK_PATH}/confman.lock ]
+    then
+        return 1
+    else
+        touch ${WORK_PATH}/confman.lock
+        echo $$ > "${WORK_PATH}/confman.lock" #Send PID to the lock to allow for recursive calls
+        return 0
+    fi
+}
+
+function conf_unlock_wcopy {
+    if [ -f ${WORK_PATH}/confman.lock ]
+    then
+        rm ${WORK_PATH}/confman.lock
+    fi
+}
+
+function conf_lock_system {
+    if [ -f /var/run/confman.lock ]
+    then
+        return 1
+    else
+        sudo touch /var/run/confman.lock
+        sudo chmod 666 /var/run/confman.lock
+        sudo echo $$ > "/var/run/confman.lock" 
+        return 1
+    fi
+}
+
+function conf_unlock_system {
+    if [ -f /var/run/confman.lock ]
+    then
+        sudo rm /var/run/confman.lock
+    fi
+}
+
+function conf_wcopy_locked? {
+    if [ -f ${WORK_PATH}/confman.lock ]
+    then
+        return 0
+    else
+        return 1
+    fi
+}
+
+function conf_system_locked? {
+    if [ -f /var/run/confman.lock ]
+    then
+        return 0
+    else
+        return 1
+    fi
 }
 
@@ -377 +448 @@
         svn mv ${WORK_PATH}/${oldmod} ${WORK_PATH}/${newmod} || \
                 {       echo "There was a problem renaming the modules." >&4 ; \
-                        conf_clean_exit 1 
+                        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_clean_exit 1 
+                        conf_cleanExit 1 
                 }
 
         svn update ${WORK_PATH} || \
                 {       echo "Your working copy didn't update correctly." >&4 ; \
-                        conf_clean_exit 1 
+                        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_clean_exit 1 
+                {       echo "Committing the changes failed." >&4 ; conf_cleanExit 1 
                 }
 
@@ -404 +475 @@
         svn update ${WORK_PATH} || \
                 {       echo "Your working copy didn't update correctly." >&4 ; \
-                        conf_clean_exit 1 
+                        conf_cleanExit 1 
                 }
         svn commit -m "Renaming ${oldmod} to ${newmod}, phase 2." \
                 ${WORK_PATH}/${newmod} || \
-                {       echo "Committing the changes failed." >&4 ; conf_clean_exit 1 
+                {       echo "Committing the changes failed." >&4 ; conf_cleanExit 1 
                 }
 
@@ -418 +489 @@
         svn update ${WORK_PATH} || \
                 {       echo "Your working copy didn't update correctly." >&4 ; \
-                        conf_clean_exit 1 
+                        conf_cleanExit 1 
                 }
         svn commit -m "Renaming ${oldmod} to ${newmod}, complete." \
                 ${WORK_PATH}/${newmod} || \
-                {       echo "Committing the changes failed." >&4 ; conf_clean_exit 1 
+                {       echo "Committing the changes failed." >&4 ; conf_cleanExit 1 
                 }
 }
@@ -536 +607 @@
 # The SIGNAL seems to kill the logger process spawned by the parent 
 # process, which is receiving its input from our fd 2.
-function conf_cleanexit {
+function conf_cleanExit {
     echo "Received a signal. Exiting cleanly." | conf_logger
         echo "Abort, Abort! Patience is a virtue." >&4
@@ -544 +615 @@
         # permissions here to be in a consistent state.
         chmod 700 ${WORK_PATH}
-
         echo "Removing leftover temp files..." >&4
         find /tmp/confman* -maxdepth 0 -user `whoami` -exec rm -rf {} \;
@@ -551 +621 @@
         echo "Undoing damage to your working copy..." >&4
         [ -d "${WORK_PATH}" ] && svn cleanup ${WORK_PATH}
-        echo "All clean. Terminating." >&4
+
+    echo "Removing any system or working copy locks..." >&4
+    conf_unlock_wcopy
+    conf_unlock_system
+        
+    echo "All clean. Terminating." >&4
 
         exit ${1:-1}
 }       
 
+function conf_checkgroup {
+        GROUP_FILE=$(mktemp -t confman)
+    GROUP_STAT=$(chgrp staff $GROUP_FILE 2>&1)
+        rm $GROUP_FILE
+        if [ -n "$GROUP_STAT" ] ; then
+       return 2
+    else
+       return 0
+    fi
+}
+
 # vim:ts=4