Changes in trunk/dsys/comINSTALL [3:1]

File:

• trunk/dsys/comINSTALL (modified) (6 diffs)

trunk/dsys/comINSTALL

@@ -340 +340 @@
     #---------------------------------------------------------------------
 
-    instlock="${yule_conf}.lockdir";
-    trap "rm -rf ${instlock}" 1 2 13 15
-
-    if test x"$simulate" = x0
-    then
-        #
-        # A lockfile will not work, because 'root' can write anyway.
-        # However, 'mkdir' an existing directory will fail even for root
-        #
-        until (umask 222; mkdir "${instlock}") 2>/dev/null   # test & set
-        do
-           printINFO "Waiting for lock"
-           sleep 1
-        done
-    fi
-
     Replace=`"${yule_exec}" -P "${is_passwd}" | sed s%HOSTNAME%${host}%g`
     if test "x$Replace" = x
     then
-        rm -rf "${instlock}"
         printFATAL "Could not execute ${yule_exec} -P ${is_passwd}."
     fi
@@ -373 +356 @@
             then
                 Seen=y
-                echo "$Replace" >>"$tmpF" 
-                if [ $? -ne 0 ]; then
-                        rm -rf "${instlock}"
-                        printFATAL "Cannot write new server configuration."
-                fi
+                echo "$Replace" >>"$tmpF" || printFATAL "Cannot write new server configuration."
             fi
         else
@@ -384 +363 @@
                 :
             else
-                echo "$line" >>"$tmpF"
-                if [ $? -ne 0 ]; then
-                        rm -rf "${instlock}"
-                        printFATAL "Cannot write new server configuration."
-                fi
+                echo "$line" >>"$tmpF" || printFATAL "Cannot write new server configuration."
             fi
         fi
@@ -405 +380 @@
     if test x"$simulate" = x0
     then
-        ageFILE "${yule_conf}"
-        if [ $? -ne 0 ]; then
-                rm -rf "${instlock}"
-                printFATAL "Could not backup ${yule_conf}"
-        fi
-
-        rm -f "${yule_conf}" && cp "$tmpF"  "${yule_conf}"
-        if [ $? -ne 0 ]; then
-                rm -rf "${instlock}"
-                printFATAL "Could not write new server config. Backup is ${yule_conf}.1"
-        fi
-
-        chown ${rcfile_owner}:${rcfile_group} "${yule_conf}"
-        if [ $? -ne 0 ]; then
-                rm -rf "${instlock}"
-                printFATAL "Could not chown ${rcfile_owner}:${rcfile_group} ${yule_conf}"
-        fi
-
-        chmod ${rcfile_perm} "${yule_conf}"
-        if [ $? -ne 0 ]; then
-                rm -rf "${instlock}"
-                printFATAL "Could not chmod ${rcfile_perm} ${yule_conf}"
-        fi
+        ageFILE "${yule_conf}" || printFATAL "Could not backup ${yule_conf}."
+        rm -f "${yule_conf}" && { cp "$tmpF"  "${yule_conf}" || printFATAL "Could not write new server config. Backup is ${yule_conf}.1"; }
+        chown ${rcfile_owner}:${rcfile_group} "${yule_conf}" || printFATAL "Could not chown ${rcfile_owner}:${rcfile_group} ${yule_conf}"
+        chmod ${rcfile_perm} "${yule_conf}" || printFATAL "Could not chmod ${rcfile_perm} ${yule_conf}"
     else
         printINFO "Backup and update ${yule_conf}"
@@ -467 +423 @@
         sleep 5
         #
-        rm -rf "${instlock}"
     else
         printINFO "Reloading server configuration."
@@ -473 +428 @@
 
     printLOG "Server configuration updated and reloaded."
-
 
     #---------------------------------------------------------------------