add_eterkey.sh: set VEID always

rooter/add_eterkey.sh

@@ -12,7 +12,7 @@ docmd()
 
 fatal()
 {
-	echo "Error: $@"
+	echo -e "Error: $@"
 	exit 1
 }
 
@@ -20,8 +20,17 @@ USERNAME=$1
 HOST=$2
 VEID=$3
 
-[ -n "$USERNAME" ] || fatal "Usage: $0 username host [VEID | -l]"
-[ -n "$HOST" ] || fatal "Usage: $0 username host [VEID | -l]"
+Help="Usage: $0 USERNAME HOST {VEID | -l}\nHOST - from yours ssh alias\nVEID - container ID or 0 for host system"
+
+if [ "$USERNAME" = "-h" ]; then
+	echo -e "$Help"
+	exit
+fi
+
+if [ -z "$USERNAME" ] || [ -z "$HOST" ] || [ -z "$VEID" ]; then
+	fatal "$Help"
+fi
+
 
 USERKEY=$(ssh rooter@server get pubkey $USERNAME)
 
@@ -38,7 +47,7 @@ HSSH=/home/$USERNAME/.ssh
 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"
 
 # copy key in host system
-if [ -z "$VEID" ] ; then
+if [ -z "$VEID" ] || [ "$VEID" = 0 ] ; then
 	echo "Copy key for $USERNAME to $HOST"
 	echo "$USERKEY" | docmd ssh $HOST "$ADDKEYCMD"
 	ssh $HOST $SUDO ls /home/$USERNAME/.ssh -l