Changeset 3 for trunk/dsys/funcINSTALL

Timestamp:

Dec 21, 2005, 10:07:54 PM (19 years ago)

Author:

rainer

Message:

More fixes for update function, released 2.1.1 version.

File:

• trunk/dsys/funcINSTALL (modified) (2 diffs)

trunk/dsys/funcINSTALL

@@ -91 +91 @@
         DATABASE="${basedir}/${defdatabase}"
     fi
+
+    updlock="${DATABASE}.lockdir"
+    trap "rm -rf ${updlock}" 1 2 13 15
+
+    #
+    # A lockfile will not work, because 'root' can write anyway.
+    # However, 'mkdir' an existing directory will fail even for root
+    #
+    until (umask 222; mkdir "${updlock}") 2>/dev/null   # test & set
+    do
+       printINFO "Waiting for lock"
+       sleep 1
+    done
+
 
     IDATE=`date +"%Y-%m-%d %H:%M:%S"`
@@ -223 +237 @@
     fi
 
-    chown ${rcfile_owner}:${rcfile_group} "${DATABASE}" || printFATAL "Could not chown ${rcfile_owner}:${rcfile_group} ${DATABASE}"
-    chmod ${rcfile_perm} "${DATABASE}" || printFATAL "Could not chmod ${rcfile_perm} ${DATABASE}"
-
+    chown ${rcfile_owner}:${rcfile_group} "${DATABASE}"
+    if [ $? -ne 0 ]; then
+        rm -rf "${instlock}"
+        printFATAL "Could not chown ${rcfile_owner}:${rcfile_group} ${DATABASE}"
+    fi
+    chmod ${rcfile_perm} "${DATABASE}"
+    if [ $? -ne 0 ]; then
+        rm -rf "${instlock}"
+        printFATAL "Could not chmod ${rcfile_perm} ${DATABASE}"
+    fi
+
+    rm -rf "${updlock}"
 }