Changeset 37 for confman/confman

Timestamp:

03/29/2006 02:29:23 (6 years ago)

Author:

ccowart

Message:

Some syntax touchups, a couple extra wrappers to svn. Business.

File:

• confman/confman (modified) (9 diffs)

confman/confman

@@ -1 +1 @@
 #! /usr/local/bin/bash
 
-# $Rev$
-# $Author$
-# $Date$
+# $Id$
 
 # Some global definitions. Defaults that can be overriden by options.
-GCONF="/home/ccowart/src/confman/confman.conf"
+GCONF="/usr/local/rescomp/etc/confman.conf"
 UCONF="${HOME}/.confmanrc"
 MYNAME=`basename $0`
@@ -54 +52 @@
   $MYNAME setup
   $MYNAME update
+  $MYNAME commit
+  $MYNAME diff [ working_copy ]
+  $MYNAME log [ working_copy ]
   $MYNAME create module
-  $MYNAME commit
   $MYNAME rmmod module
-  $MYNAME import module file
-  $MYNAME remove module file
-  $MYNAME mkdir module directory
-  $MYNAME ls [ file | directory ]
-  $MYNAME chown module [ file | directory ] owner
-  $MYNAME chgrp module [ file | directory ] group
-  $MYNAME chmod module [ file | directory ] mode
-  $MYNAME chcom module [ file | directory ] comment-character
+  $MYNAME import module livefile
+  $MYNAME rm workingfile
+  $MYNAME cp src_working_copy dest_working_copy
+  $MYNAME mv src_working_copy dest_working_copy
+  $MYNAME mkdir workingdirectory
+  $MYNAME ls [ workingfile | workingdirectory ]
+  $MYNAME chown owner [ workingfile | workingdirectory ] 
+  $MYNAME chgrp group [ workingfile | workingdirectory ] 
+  $MYNAME chmod mode  [ workingfile | workingdirectory ] 
+  $MYNAME chcom comment-character [ workingfile | workingdirectory ] 
   $MYNAME checklook module
   $MYNAME checknew module name
   $MYNAME checkclear module name
-  $MYNAME rollback module name
+  $MYNAME rollback module [ checkpoint | YYYYMMDD [HHMM] ]
 
 For specific information on a particular $MYNAME subcommand, please run
@@ -132 +134 @@
 the repository.
 
+EOF
+;;
+          diff )
+cat <<EOF
+$MYNAME provides a command-line interface to Rescomp's server
+configuration management system.
+
+Usage:
+  $MYNAME diff [ working_copy ]
+
+Look at the changes you've made to your working copy of a file or directory.
+EOF
+;;
+          log )
+cat <<EOF
+$MYNAME provides a command-line interface to Rescomp's server
+configuration management system.
+
+Usage:
+  $MYNAME log [ working_copy ]
+
+Look at the log entries for the file or directory specified by working_copy.
+EOF
+;;
+          cp )
+cat <<EOF
+$MYNAME provides a command-line interface to Rescomp's server
+configuration management system.
+
+Usage:
+  $MYNAME cp src_working_copy dest_working_copy
+
+Copy source to destination. Arguments must be working copies.
+EOF
+;;
+          mv )
+cat <<EOF
+$MYNAME provides a command-line interface to Rescomp's server
+configuration management system.
+
+Usage:
+  $MYNAME mv src_working_copy dest_working_copy
+
+Move source to destination. Arguments must be working copies.
 EOF
 ;;
@@ -328 +374 @@
 ;;
 esac
+exit $2
 }
 
@@ -378 +425 @@
                 update || return $?
                 echo "Change this file to your log message." > $msg
-                ${EDITOR} msg
-                local msg="${msg} --`whoami`"
+                ${EDITOR} $msg
+                #local msg="${msg} --`whoami`"
                 for layer in $LAYERS ; do
                         conf_commit $layer $msg || return $?
@@ -482 +529 @@
 
 function remove {
-        local module=$1
-        local file=$2
+        local file=`abspath "$1"`
         local response
-        if [ -z $2 ] ; then print_usage 1 ; fi
-        echo "Are you sure you want to delete this file from revision control?"
-        while read response ; do
-                case $response in
-                        Y|y|yes )
-                                break
-                                ;;
-                        N|n|no )
-                                return 1
-                                ;;
-                        * )
-                                echo "Please type yes or no."
-                                continue
-                                ;;
-                esac
-        done
-
-        conf_rm_file $module $file
+        if [ -z $1 ] ; then print_usage 1 ; fi
+        conf_rm_file $file
 }
 
 function newdir {
-        local module=$1
-        local dir=$2
-        local response usefile 
+        local dir=$1
+        local response 
         local mode=$DEFAULT_MODE
         local owner=$DEFAULT_OWNER
         local group=$DEFAULT_GROUP
         local comment="dir"
-        if [ -z $2 ] ; then
-                print_usage 1
-        fi
-
-        echo 
-        echo "Creating the directory $dir"
-        echo
-
-        if [ -d $dir ] ; then
-                eval `stat -f "mode=%Mp%Lp owner=%Su group=%Sg" $dir`
+        local workdir=`abspath .`
+        if [ -z $1 ] ; then
+                print_usage 1
+        fi
+
+        # Find the "real" directory's path
+        dir="${workdir}/${dir}"
+        local module=`echo ${workdir#$WORK_PATH/} | sed -E 's:/([^/]+)/.*:\1:'`
+        echo $module
+        local realpath=${dir#${WORK_PATH}/${module}}
+        echo $realpath
+
+        if [ -d $realpath ] ; then
+                eval `stat -f "mode=%Mp%Lp owner=%Su group=%Sg" $realpath`
 
                 # Convert mode string to base 10:
@@ -555 +588 @@
 
         # Time to create the directory.
-        echo "Making $dir in $module with ${owner}:${group}, $mode"
-        conf_mkdir $module $dir $owner $group $mode 
+        echo "Making directory $dir with ${owner}:${group}, $mode"
+        conf_mkdir $dir $owner $group $mode 
 }
 
@@ -708 +741 @@
 }
 
+function diff {
+        conf_diff $*
+}
+
+function log {
+        conf_log $*
+}
+
+function copy {
+        local src=$1
+        local dest=$2
+
+        if [ -z $2 ] ; then print_usage 1 ; fi
+
+        conf_cp $src $dest
+}
+
+function move {
+        local src=$1
+        local dest=$2
+
+        if [ -z $2 ] ; then print_usage 1 ; fi
+
+        conf_mv $src $dest
+}
+
 function absdir {
   local file="$1"
@@ -770 +829 @@
                 list $*
                 ;;
+        move|mv )
+                move $*
+                ;;
+        copy|cp )
+                copy $*
+                ;;
+        diff )
+                diff $*
+                ;;
+        log )
+                log $*
+                ;;
         chmod )
                 chmode $*