improve rooter scripts

rooter/add_eterkey.sh

@@ -40,18 +40,22 @@ ssh $HOST echo || fatal "Host $HOST is not sshed"
 
 SUDO=
 [ "$UID" = 0 ] || SUDO="sudo"
+HOSTSUDO=$SUDO
 
 # FIXME: почему-то в cat не раскрывается тильда!
 #ADDKEYCMD="useradd $USERNAME ; su - $USERNAME -c 'mkdir -p ~/.ssh ; chmod 700 ~/.ssh ; touch ~/.ssh/authorized_keys ; chmod 600 ~/.ssh/authorized_keys' ; cat >> /home/$USERNAME/.ssh/authorized_keys"
 HSSH=/home/$USERNAME/.ssh
 # TODO: исправить повторное добавление ключей
-ADDKEYCMD="$SUDO useradd $USERNAME ; $SUDO su - $USERNAME -c 'mkdir -p $HSSH ; chmod 700 $HSSH ; touch $HSSH/authorized_keys ; chmod 600 $HSSH/authorized_keys' ; cat >> $HSSH/authorized_keys"
+add_key_cmd()
+{
+	echo "$SUDO useradd $USERNAME ; $SUDO su - $USERNAME -c 'mkdir -p $HSSH ; chmod 700 $HSSH ; touch $HSSH/authorized_keys ; chmod 600 $HSSH/authorized_keys' ; cat >> $HSSH/authorized_keys"
+}
 
 # copy key in host system
 if [ -z "$VEID" ] || [ "$VEID" = 0 ] ; then
 	echo "Copy key for $USERNAME to host $HOST"
-	echo "$USERKEY" | docmd ssh $HOST "$ADDKEYCMD"
-	ssh $HOST $SUDO ls /home/$USERNAME/.ssh -l
+	echo "$USERKEY" | docmd ssh $HOST "$(add_key_cmd)"
+	ssh $HOST $HOSTSUDO ls /home/$USERNAME/.ssh -l
 	#ssh -i $USERKEY $USERNAME@$HOST ls ~/.ssh -l
 	# TODO (.gitconfig)
 	#  git config --global user.email "you@example.com"
@@ -62,10 +66,11 @@ fi
 
 # show containter list
 if [ "$VEID" = "-l" ] ; then
-	docmd ssh $HOST $SUDO vzlist
+	docmd ssh $HOST $HOSTSUDO vzlist
 	exit
 fi
 
 # copy key in VEID container at host system
 echo "Copy key for $USERNAME to $HOST, VEID=$VEID"
-echo "$USERKEY" | ssh $HOST "$SUDO vzctl exec $VEID \"$ADDKEYCMD\""
+SUDO=
+echo "$USERKEY" | ssh $HOST "$HOSTSUDO vzctl exec $VEID \"$(add_key_cmd)\""

rooter/add_gitkey.sh

@@ -27,7 +27,7 @@ if [ -z "$USERNAME" ] || [ -z "$GITHOST" ] || [ -z "$USERDESC" ]; then
 	fatal "$Help"
 fi
 
-USERKEY=$(ssh rooter@server get pubkey $USERNAME)
+USERKEY=$(ssh rooter@server pubkey $USERNAME) || fatal "Can't get pubkey"
 
 [ -n "$USERKEY" ] || fatal "Can't get ssh key"