Merge lp:~derek-name/openvista-gtm-integration/bug646483 into lp:openvista-gtm-integration

[Derek_]

[lp:~derek-name/openvista-gtm-integration/bug646483]

142. By Derek_ on 2010-09-24

ovinstanceadd.8 (man page): Describe the -p option.

143. By Derek_ on 2010-09-24

Fix typo and use defined variable in ovinstanceadd bash completion.

[Jon Tai (jontai)]

review: Approve

=== modified file 'docs/man8/ovinstanceadd.8'
--- docs/man8/ovinstanceadd.8	2010-09-23 21:43:57 +0000
+++ docs/man8/ovinstanceadd.8	2010-09-24 19:22:50 +0000
@@ -18,6 +18,11 @@
 database files, creates default configuration files, generates an SSH key for
 the instance, sets up an ssh forced command to run ^ZU in the instance, and
 creates the webdav root for the instance.
+.PP
+By default, ovinstanceadd sets up the new instance to use the latest version of
+GT.M installed on the system.  You can specify an alternate path to a GT.M
+installation with the -p flag.  The -p flag was added in \fBovinstanceadd\fR
+0.8.10.
 .SH OPTIONS
 .IP -p
 path; value of $gtm_dist for this instance

=== modified file 'scripts/etc/bash_completion.d/openvista'
--- scripts/etc/bash_completion.d/openvista	2010-02-11 18:50:29 +0000
+++ scripts/etc/bash_completion.d/openvista	2010-09-24 19:22:50 +0000
@@ -6,16 +6,16 @@
 # This program is free software; you can redistribute it and/or modify it solely
 # under the terms of the GNU Affero General Public License version 3 as published
 # by the Free Software Foundation.
-# 
+#
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses>.
-# 
-# You can contact Medsphere Systems Corporation headquarters at 1917 Palomar 
+#
+# You can contact Medsphere Systems Corporation headquarters at 1917 Palomar
 # Oaks Way, Suite 200, Carlsbad, CA 92008 or at [e-mail].
 
 
@@ -27,8 +27,8 @@
     COMPREPLY=()
 
     for i in `seq $COMP_CWORD`; do
-	# we've run out of the allowed number of non-option arguments; perform
-	# no further completion
+        # we've run out of the allowed number of non-option arguments; perform
+        # no further completion
         if [ $allowed_nonopt_words -eq 0 ]; then
             return
         fi
@@ -37,9 +37,9 @@
             -*)
                 # if one of the arguments so far is -h or -V, perform no further completion
                 if [ x"${COMP_WORDS[i]}" = x"-h" ] || [ x"${COMP_WORDS[i]}" = x"-V" ]; then
-		    # if we just return here, -h won't complete the space
-		    # afterward; use a hack to exit on the next iteration of
-		    # the loop
+                    # if we just return here, -h won't complete the space
+                    # afterward; use a hack to exit on the next iteration of
+                    # the loop
                     allowed_nonopt_words=0
                 fi
                 ;;
@@ -112,23 +112,47 @@
 
 complete -F _ovrestore $filenames ovrestore
 
-# ovinstanceadd [-h] [-V] NEW_INSTANCE_NAME
+# ovinstanceadd [-h] [-V] [-p path] NEW_INSTANCE_NAME
 _ovinstanceadd()
 {
+    opts='-h -V -p'
+    allowed_nonopt_words=1
+
     COMPREPLY=()
 
-    if [ $COMP_CWORD -gt 1 ]; then
-        return
-    fi
-
-    case ${COMP_WORDS[COMP_CWORD]} in
+    for i in $(seq $COMP_CWORD); do
+        [[ "$allowed_nonopt_words" == 0 ]] && return
+        case ${COMP_WORDS[i]} in
+            -*)
+                if [[ "${COMP_WORDS[i]}" == "-h" ]] \
+                  || [[ "${COMP_WORDS[i]}" == "-V" ]]; then
+                    allowed_nonopt_words=0
+                elif [[ "${COMP_WORDS[i]}" == "-p" ]]; then
+                    allowed_nonopt_words=$(( $allowed_nonopt_words + 1 ))
+                fi
+                ;;
+            *)
+                allowed_nonopt_words=$(( $allowed_nonopt_words - 1 ))
+                ;;
+        esac
+    done
+
+    cur=${COMP_WORDS[COMP_CWORD]}
+    prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    case $cur in
         -*)
-            COMPREPLY=( $(compgen -W "-h -V" -- ${COMP_WORDS[COMP_CWORD]}) )
+            COMPREPLY=( $(compgen -W "$opts" -- $cur) )
+            ;;
+        *)
+            if [[ "$prev" == "-p" ]]; then
+                _filedir
+            fi
             ;;
     esac
 }
 
-complete -F _ovinstanceadd ovinstanceadd
+complete -F _ovinstanceadd $filenames ovinstanceadd
 
 # ovimport [-h] [-V] [-q] [-f] [-t target] [-c imported|all|none] [-r] ROUTINES [-g] GLOBALS INSTANCE_NAME
 _ovimport()
@@ -139,8 +163,8 @@
     COMPREPLY=()
 
     for i in `seq $COMP_CWORD`; do
-	# we've run out of the allowed number of non-option arguments; perform
-	# no further completion
+        # we've run out of the allowed number of non-option arguments; perform
+        # no further completion
         if [ $allowed_nonopt_words -eq 0 ]; then
             return
         fi
@@ -149,9 +173,9 @@
             -*)
                 # if one of the arguments so far is -h or -V, perform no further completion
                 if [ x"${COMP_WORDS[i]}" = x"-h" ] || [ x"${COMP_WORDS[i]}" = x"-V" ]; then
-		    # if we just return here, -h won't complete the space
-		    # afterward; use a hack to exit on the next iteration of
-		    # the loop
+                    # if we just return here, -h won't complete the space
+                    # afterward; use a hack to exit on the next iteration of
+                    # the loop
                     allowed_nonopt_words=0
                 elif [ x"${COMP_WORDS[i]}" = x"-t" ] || [ x"${COMP_WORDS[i]}" = x"-c" ] || [ x"${COMP_WORDS[i]}" = x"-r" ] || [ x"${COMP_WORDS[i]}" = x"-g" ]; then
                     allowed_nonopt_words=`expr $allowed_nonopt_words + 1`
@@ -196,8 +220,8 @@
     COMPREPLY=()
 
     for i in `seq $COMP_CWORD`; do
-	# we've run out of the allowed number of non-option arguments; perform
-	# no further completion
+        # we've run out of the allowed number of non-option arguments; perform
+        # no further completion
         if [ $allowed_nonopt_words -eq 0 ]; then
             return
         fi
@@ -206,9 +230,9 @@
             -*)
                 # if one of the arguments so far is -h or -V, perform no further completion
                 if [ x"${COMP_WORDS[i]}" = x"-h" ] || [ x"${COMP_WORDS[i]}" = x"-V" ]; then
-		    # if we just return here, -h won't complete the space
-		    # afterward; use a hack to exit on the next iteration of
-		    # the loop
+                    # if we just return here, -h won't complete the space
+                    # afterward; use a hack to exit on the next iteration of
+                    # the loop
                     allowed_nonopt_words=0
                 fi
                 ;;