Changeset 76

Timestamp:

04/14/2006 19:17:22 (6 years ago)

Author:

ccowart

Message:

Coded the install function for installing a single file.

Location:

confman

Files:

• confman (modified) (5 diffs)
• confmandoc.sh (modified) (3 diffs)
• confmanlib.sh (modified) (1 diff)

confman/confman

@@ -108 +108 @@
         if [ -z $* ] ; then
                 for layer in $LAYERS ; do
-                        conf_update_module $layer || return $?
-                done
+                        conf_update_module $layer || cleanexit
+                done
+                conf_update_module ${REPO_CHECKPTS} || cleanexit
         else
                 print_usage 1
@@ -118 +119 @@
         if [ -z $* ] ; then
                 local msg=`mktemp -t confman`
-                update || return $?
+                # Moved up per Ian's request.
                 echo "Change this file to your log message." > $msg
                 ${EDITOR} $msg
+                update || cleanexit
 
                 for layer in $LAYERS ; do
@@ -138 +140 @@
         fi
 }
+
+# Short name intentional, don't want collision with real install.
+function inst {
+        local file
+
+        if [ -z $* ] ; then
+                print_usage 1
+        else
+                local msg=`mktemp -t confman`
+                # Moved up per Ian's request.
+                echo "Change this file to your log message." > $msg
+                ${EDITOR} $msg
+                update || cleanexit
+
+                for layer in $LAYERS ; do
+                        conf_commit $layer $msg || return $?
+                done
+
+                for file in $* ; do
+                        file=`abspath $file`
+
+                        for layer in $LAYERS ; do
+                                conf_install $layer $file
+                        done
+                        
+                        if [[ "$SINGULARITIES" =~ "$file" ]] ; then
+                                conf_assemble_file $file
+                        fi
+                done
+        fi
+}
+        
 
 function import {
@@ -494 +528 @@
                         conf_rollout $layer
                 done
+
+                for file in $SINGULARITIES ; do
+                        conf_assemble_sing $file
+                done
         fi
 }
@@ -564 +602 @@
                 commit $*
                 ;;
-        import|i* )
+        import|im* )
                 import $*
+                ;;
+        install|in* )
+                inst $*
                 ;;
         remove|re*|rm )

confman/confmandoc.sh

@@ -26 +26 @@
   $MYNAME rmmod module
   $MYNAME import module livefile
+  $MYNAME install working_copy
   $MYNAME rm workingfile
   $MYNAME cp src_working_copy dest_working_copy
@@ -181 +182 @@
 EOF
 ;;
-          i* )
+          im* )
 cat <<EOF
 $MYNAME provides a command-line interface to Rescomp's server
@@ -191 +192 @@
 The import subcommand adds the specified file to your working copy of the
 repository. 
+
+EOF
+;;
+          in* )
+cat <<EOF
+$MYNAME provides a command-line interface to Rescomp's server
+configuration management system.
+
+Usage:
+  $MYNAME install working_file [ working_file ... ]
+
+The install subcommand allows you to roll out a single file from your working
+copy.
 
 EOF

confman/confmanlib.sh

@@ -95 +95 @@
           $cmd
   done
-  for file in $SINGULARITIES ; do
-          conf_assemble_sing ${module} ${file}
-  done
   # This is a hack to work around NFS home dirs, for now:
   chmod o-rx ${WORK_PATH}
 }
+
+function conf_install {
+  local module="$1"
+  local file="$2"
+  local moduledir="${WORK_PATH}/$module"
+  local livefile=`echo "$file" | sed -E "s:${WORK_PATH}/[^/]+::"`
+
+  # See if it even exists
+  file="${moduledir}${livefile}"
+  if [ ! -f $file ] ; then
+          return 0
+  fi
+
+  # If we got here, figure it out
+  local owner=`conf_get_prop ${file} owner`
+  local group=`conf_get_prop ${file} group`
+  local mode=`conf_get_prop ${file} mode`
+  local opts="-Sp -o $owner -g $group -m $mode"
+  local cmd="sudo install $opts $file ${LIVE_ROOT}$livefile"
+
+  chmod o+rx ${WORK_PATH}
+  echo $cmd
+  $cmd
+  chmod o-rx ${WORK_PATH}
+}
+
 
 function conf_list {