Changeset 79

Timestamp:

04/15/2006 19:53:56 (6 years ago)

Author:

yontege

Message:

Reveting completions to a previous state due to strange behavior:

confman help checkclear

would complete to something like

confman help checkclear ;

and then drop to a prompt without you knowing it.

File:

• confman/bash_completions (modified) (5 diffs)

confman/bash_completions

@@ -1 @@
-#! /bin/bash
-
+#!/bin/bash
 _confman() 
 {
-        local cur prev cmds twoback cmds fd_cmds mod_cmds chkpt_cmds threeback
+        local cur prev cmds twoback cmds fd_cmds mod_cmds chkpt_cmds
         CONFMAN="/usr/local/rescomp/sbin/confman"
-        # Get $RECIPE_PATH
-        source "/usr/local/rescomp/etc/confman.conf"
-        source "~/.confmanrc"
         COMPREPLY=()
         cur="${COMP_WORDS[COMP_CWORD]}"
@@ -18 +14 @@
         fi
         [ ! -x $CONFMAN ] && echo "confman support not available!!" && exit 1
-
+        
         #
         #       fd_cmds:        commands that take files and directories as args
@@ -26 +22 @@
         #                                                               /\ A chkpt_cmd
         #       cmds:           commands that confman can take as the first arg
-        # 
+        #
         fd_cmds="rm cp mv mkdir ls chown chgrp chmod chcom"
         mod_cmds="create rmmod import checklook checknew checkclear rollback"
         chkpt_cmds="checklook checknew checkclear rollback"
-        cmds="help setup update commit diff log create rmmod import rm cp mv mkdir ls chown chgrp chmod chcom checklook checknew checkclear rollback status"
-
-        #
-        #  Complete the arguments to some of the basic commands.
-        #
+        cmds="help setup update commit diff log status $fd_cmds $mod_cmds"
+        
 
         if [ `expr "${fd_cmds}" : ".*\(${prev}\).*"` ] ; then
             COMPREPLY=( $(compgen -A directory -A file ${cur}) )
-        return 0
+            return 0
         elif [ `expr "${mod_cmds}" : ".*\(${prev}\).*"` ] ; then
-                local modules=$(grep -vE '^$|^#' ${RECIPE_PATH} |tr '\n' ' ')
+                CONFDIR="${REPO_PATH:-$HOME/src}/conf"
+                local modules=$(/bin/ls $CONFDIR | grep -v checkpoints|tr '\n' ' ')
                 COMPREPLY=($(compgen -W "${modules}" -- ${cur}))
                 return 0
         elif [ `expr "import ${fd_cmds}" : ".*\(${twoback}\).*"` ] ; then
             COMPREPLY=($(compgen -A directory -A file ${cur}))
-        return 0
+            return 0
         elif [ `expr rollback : ".*\(${twoback}\).*"` ] ; then
                 local module=${prev}
@@ -66 +60 @@
                                                         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
+        COMPREPLY=($(compgen -W "${hoursmins}" -- ${cur}))
+        return 0
         fi
 
@@ -73 +67 @@
         return 0
 }
-
 complete -F _confman confman