Changeset 88 for confman/bash_completions

Timestamp:

04/18/2006 22:39:16 (6 years ago)

Author:

yontege

Message:

Added the ability to complete checkpoints while not in working paths.

File:

• confman/bash_completions (modified) (4 diffs)

confman/bash_completions

@@ -7 +7 @@
 {
         local cur prev cmds twoback cmds fd_cmds mod_cmds chkpt_cmds
+        local CONFMAN CONFMAN_CONF CONFMAN_RC RECIPE_PATH WORK_PATH
 
         # Setup ConfMan specific vars
@@ -12 +13 @@
         CONFMAN_CONF="/usr/local/rescomp/etc/confman.conf"
         CONFMAN_RC="~/.confmanrc"
-        if [ -e ${CONFMAN_CONF} ] ; then
+        if [ -e ${CONFMAN_RC} ] ; then
+                RECIPE_PATH=$(grep '^RECIPE_PATH' ${CONFMAN_RC}|cut -d'"' -f2)
+                WORK_PATH=$(grep '^WORK_PATH' ${CONFMAN_RC}|cut -d'"' -f2)
+        elif [ -e ${CONFMAN_CONF} ] ; then
                 RECIPE_PATH=$(grep '^RECIPE_PATH' ${CONFMAN_CONF}|cut -d'"' -f2)
-        elif [ -e ${CONFMAN_RC} ] ; then
-                RECIPE_PATH=$(grep '^RECIPE_PATH' ${CONFMAN_RC}|cut -d'"' -f2)
+                WORK_PATH=$(grep '^WORK_PATH' ${CONFMAN_CONF}|cut -d'"' -f2)
         fi
+        RECIPE_PATH=$(eval echo $RECIPE_PATH)
+        WORK_PATH=$(eval echo $WORK_PATH)
 
         # Setup Standard command completion vars
@@ -67 +72 @@
         elif [ "rollback" == "${twoback}" ] ; then
                 local module=${prev}
+                local module_path="${WORK_PATH}/${module}"
                 local named_checkpoints=$(confman checklook ${module}|\
-                                                tr '\n' ' ')
-                local numbered_checkpoints=$(confman log |grep '^r[0-9][0-9]*' |\
+                                                tr '\n' ' '
+                                        )
+                local numbered_checkpoints=$(confman log $module_path|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' ' ')
@@ -76 +83 @@
                 return 0
         elif [ "rollback" == "${threeback}" ] ; then
+                local module=${twoback}
+                local module_path="${WORK_PATH}/${module}"
                 local day=${prev:0:4}-${prev:4:2}-${prev:6:2}
-                local hoursmins=$(confman log |grep '^r[0-9][0-9]*' |\
-                                                        grep 2006-04-06|\
-                                                        sed 's/.*20[0-9][0-9]-[0-9][0-9]-[0-9][0-9] \([0-9][0-9]\):\([0-9][0-9]\).*/"\1\2"/'|\
-                                                        tr '\n' ' ')
+                local hoursmins=$(confman log $module_path|grep '^r[0-9][0-9]*' |\
+                                        grep 2006-04-06|\
+                                        sed 's/.*20[0-9][0-9]-[0-9][0-9]-[0-9][0-9] \([0-9][0-9]\):\([0-9][0-9]\).*/"\1\2"/'|\
+                                        tr '\n' ' '
+                                )
                 COMPREPLY=($(compgen -W "${hoursmins}" -- ${cur}))
                 return 0