Changeset 87

Timestamp:

04/18/2006 22:10:47 (6 years ago)

Author:

yontege

Message:

More refactoring, now safer handling of rollback.

File:

• confman/bash_completions (modified) (6 diffs)

confman/bash_completions

@@ -1 +1 @@
 #!/bin/bash
 #
-#       TODO
+#                                               TODO
 #
-# More intelligently complete absolute paths in file/dir names
-#       e.g. et_TAB completes to etc_ rather than etc _
-#
+#                       Can't think of any.             -yontege
 _confman() 
 {
         local cur prev cmds twoback cmds fd_cmds mod_cmds chkpt_cmds
+
+        # Setup ConfMan specific vars
         CONFMAN="/usr/local/rescomp/sbin/confman"
         CONFMAN_CONF="/usr/local/rescomp/etc/confman.conf"
@@ -17 +17 @@
                 RECIPE_PATH=$(grep '^RECIPE_PATH' ${CONFMAN_RC}|cut -d'"' -f2)
         fi
+
+        # Setup Standard command completion vars
         COMPREPLY=()
         cur="${COMP_WORDS[COMP_CWORD]}"
@@ -28 +30 @@
         [ ! -x $CONFMAN ] && echo "confman support not available!!" && exit 1
         
+        # These vars are to better organize things to complete to as well as 
+        # provide loose documention about what this does.
         #
         #       fd_cmds:        commands that take files and directories as args
@@ -38 +42 @@
         fd_cmds="rm cp mv mkdir ls chown chgrp chmod chcom log install revert"
         mod_cmds="create rmmod import checklook checknew checkclear rollback"
-        chkpt_cmds="checklook checknew checkclear rollback"
-        cmds="help setup update commit diff status $fd_cmds $mod_cmds"
+        # 'rollback' is also a chkpt_cmd, but needs to be handled separately
+        # because it's the only one that handles dated checkpoints.
+        chkpt_cmds="checklook checknew checkclear"
+        cmds="help setup update commit diff status rollback $fd_cmds $mod_cmds"
         
         if [ "${prev}" == "confman" -o "${prev}" == "help" ] ; then
@@ -59 +65 @@
                 COMPREPLY=($(compgen -W "${checkpoints}" -- ${cur}))
                 return 0
-        elif [ `expr "rollback" : ".*\(${threeback}\).*"` ] ; then
+        elif [ "rollback" == "${twoback}" ] ; then
+                local module=${prev}
+                local named_checkpoints=$(confman checklook ${module}|\
+                                                tr '\n' ' ')
+                local numbered_checkpoints=$(confman log |grep '^r[0-9][0-9]*' |\
+                        sed 's/.*\(20[0-9][0-9]\)-\([0-9][0-9]\)-\([0-9][0-9]\).*/"\1\2\3"/'|\
+                        tr '\n' ' ')
+                checkpoints="${named_checkpoints} ${numbered_checkpoints}"
+                COMPREPLY=($(compgen -W "${checkpoints}" -- ${cur}))
+                return 0
+        elif [ "rollback" == "${threeback}" ] ; then
                 local day=${prev:0:4}-${prev:4:2}-${prev:6:2}
                 local hoursmins=$(confman log |grep '^r[0-9][0-9]*' |\
@@ -67 +83 @@
                 COMPREPLY=($(compgen -W "${hoursmins}" -- ${cur}))
                 return 0
-        elif [ `expr "rollback" : ".*\(${twoback}\).*"` ] ; then
-                local module=${prev}
-                local checkpoints=$(confman checklook ${module}|tr '\n' ' ')
-                local num_checkpoints=$(confman log |grep '^r[0-9][0-9]*' |\
-                        sed 's/.*\(20[0-9][0-9]\)-\([0-9][0-9]\)-\([0-9][0-9]\).*/"\1\2\3"/'|\
-                        tr '\n' ' ')
-                checkpoints="${checkpoints} ${num_checkpoints}"
-                COMPREPLY=($(compgen -W "${checkpoints}" -- ${cur}))
-                return 0
         fi
 
         return 0
 }
+
+# It's necessary to not define a catch-all completion above so that we 
+# can use the '-o filenames' switch to best handle {file,dir}name
+# completions.
 complete -F _confman -o filenames confman