Changeset 86

Timestamp:

04/18/2006 21:52:33 (6 years ago)

Author:

yontege

Message:

Fixed the abspath issue and did some refactoring.

File:

• confman/bash_completions (modified) (3 diffs)

confman/bash_completions

@@ -41 +41 @@
         cmds="help setup update commit diff status $fd_cmds $mod_cmds"
         
-
-        if [ `expr "${fd_cmds}" : ".*\(${prev}\).*"` ] ; then
-            COMPREPLY=( $(compgen -A directory -A file ${cur}) )
-            return 0
+        if [ "${prev}" == "confman" -o "${prev}" == "help" ] ; then
+                COMPREPLY=($(compgen -W "${cmds}" -- ${cur}))  
+                return 0
+        elif [ `expr "${fd_cmds}" : ".*\(${prev}\).*"` ] ; then
+                COMPREPLY=( $(compgen -A directory -A file ${cur}) )
+                return 0
         elif [ `expr "${mod_cmds}" : ".*\(${prev}\).*"` ] ; then
                 local modules=$(grep -vE '^#|^$' $RECIPE_PATH | tr '\n' ' ')
@@ -50 +52 @@
                 return 0
         elif [ `expr "import ${fd_cmds}" : ".*\(${twoback}\).*"` ] ; then
-            COMPREPLY=($(compgen -A directory -A file ${cur}))
-            return 0
-        elif [ `expr rollback : ".*\(${twoback}\).*"` ] ; then
+                COMPREPLY=($(compgen -A directory -A file ${cur}))
+                return 0
+        elif [ `expr "${chkpt_cmds}" : ".*\(${twoback}\).*"` ] ; then
+                local module=${prev}
+                local checkpoints=$(confman checklook ${module}|tr '\n' ' ')
+                COMPREPLY=($(compgen -W "${checkpoints}" -- ${cur}))
+                return 0
+        elif [ `expr "rollback" : ".*\(${threeback}\).*"` ] ; then
+                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' ' ')
+                COMPREPLY=($(compgen -W "${hoursmins}" -- ${cur}))
+                return 0
+        elif [ `expr "rollback" : ".*\(${twoback}\).*"` ] ; then
                 local module=${prev}
                 local checkpoints=$(confman checklook ${module}|tr '\n' ' ')
@@ -61 +76 @@
                 COMPREPLY=($(compgen -W "${checkpoints}" -- ${cur}))
                 return 0
-        elif [ `expr "${chkpt_cmds}" : ".*\(${twoback}\).*"` ] ; then
-                local module=${prev}
-                local checkpoints=$(confman checklook ${module}|tr '\n' ' ')
-                COMPREPLY=($(compgen -W "${checkpoints}" -- ${cur}))
-                return 0
-        elif [ `expr rollback : ".*\(${threeback}\).*"` ] ; then
-                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' ' ')
-        COMPREPLY=($(compgen -W "${hoursmins}" -- ${cur}))
-        return 0
         fi
 
-        COMPREPLY=($(compgen -W "${cmds}" -- ${cur}))  
         return 0
 }
-complete -F _confman confman
+complete -F _confman -o filenames confman