[Lunar-commits] CVS: lunar-tools/clad clad,1.2,1.3 clad.rc,1.1,1.2

[Auke Kok]

Update of /var/cvs/lunar/lunar-tools/clad
In directory espresso.foo-projects.org:/home/sofar/active/lunar-tools/clad

Modified Files:
	clad clad.rc 
Log Message:
small adjustments to key uploading (more silent) and a completion bugfix

Index: clad
===================================================================
RCS file: /var/cvs/lunar/lunar-tools/clad/clad,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- clad	26 Nov 2004 16:22:34 -0000	1.2
+++ clad	29 Nov 2004 10:59:59 -0000	1.3
@@ -201,7 +201,7 @@
                 cluster_login $CL
                 while [ -n "$1" ]; do
                     verbose_msg "Adding \"$1\" to cluster \"$CL\""
-                    if ssh -i $CLAD_CONF_DIR/.$CL.id_dsa $USER@$1 "mkdir -p ~/.ssh ; if ! grep \"$(cat $CLAD_CONF_DIR/.$CL.id_dsa.pub | sed 's/\//\\\//g')\" ~/.ssh/authorized_keys; then echo \"$(cat $CLAD_CONF_DIR/.$CL.id_dsa.pub)\" >> ~/.ssh/authorized_keys; fi"; then
+                    if ssh -i $CLAD_CONF_DIR/.$CL.id_dsa $USER@$1 "mkdir -p ~/.ssh ; if ! grep -q \"$(cat $CLAD_CONF_DIR/.$CL.id_dsa.pub | sed 's/\//\\\//g')\" ~/.ssh/authorized_keys; then echo \"$(cat $CLAD_CONF_DIR/.$CL.id_dsa.pub)\" >> ~/.ssh/authorized_keys; fi"; then
                         if ! grep -q "^$1$" $CLAD_CONF_DIR/$CL; then
                             echo "$1" >> $CLAD_CONF_DIR/$CL
                         fi

Index: clad.rc
===================================================================
RCS file: /var/cvs/lunar/lunar-tools/clad/clad.rc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- clad.rc	26 Nov 2004 15:09:20 -0000	1.1
+++ clad.rc	29 Nov 2004 10:59:59 -0000	1.2
@@ -4,19 +4,19 @@
 
 _clad () 
 {
-	local cur prev
-	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
-	prev=${COMP_WORDS[COMP_CWORD-1]}
+    local cur prev
+    COMPREPLY=()
+    cur=${COMP_WORDS[COMP_CWORD]}
+    prev=${COMP_WORDS[COMP_CWORD-1]}
 
-	if [ $COMP_CWORD -eq 1 ] || [ "${prev:0:1}" = "-" ]; then
-		COMPREPLY=( $( compgen -W 'create destroy add remove test run list login logout' $cur ))
-	elif [ $COMP_CWORD -eq 2 ]; then
+    if [ $COMP_CWORD -eq 1 ] || [ "${prev:0:1}" = "-" ]; then
+       	COMPREPLY=( $( compgen -W 'create destroy add remove test run list login logout' $cur ))
+    elif [ $COMP_CWORD -eq 2 ]; then
         COMPREPLY=( $( compgen -W "`ls /var/lib/clad`" ))
     else
-        COMPRETLY=( $( compgen -W "`cat /var/lib/clad/$prev`" ))
-	fi
-	return 0
+        COMPREPLY=( $( compgen -W "`cat /var/lib/clad/$prev`" ))
+    fi
+    return 0
 }
 complete -F _clad clad