scripts/riot

@@ -5,19 +5,6 @@ source "$THIS_DIR/../tools/common.sh"
 RIOT_TRUST_CLIENT=${RIOT_TRUST_CLIENT:-${DFS_TRUST:-0}}
 RIOT_TRUST_SERVER=${RIOT_TRUST_SERVER:-0}
 
-# check if port number valid
-check_port() {
-    ( echo $1 | grep -qxE "[1-9][0-9]{0,4}" ) || return 1
-    test $1 -lt 65536 -a $1 -gt 0 || return 1
-    return 0
-}
-
-# check if username valid
-check_username() {
-    ( echo $1 | grep -qxE "^[a-z][-a-z0-9_]*\$" ) || return 1
-    return 0
-}
-
 # get single server setting
 # may be called more than once
 get_server_meta() {
@@ -33,24 +20,22 @@ get_server_meta() {
     if [[ "$remote" == *@* ]]; then
         RET_USERNAME=${remote%%@*}
         remote=${remote#*@}
-        check_username $RET_USERNAME || fmt_fatal invalid username \"$RET_USERNAME\"
     fi
     # if in the form ...:22
-    if [[ "$remote" == "["*"]":* || ( "$remote" != "["*"]" && "$remote" == *:* ) ]]; then
+    if [[ "$remote" == *:* ]]; then
         RET_PORT=${remote##*:}
         remote=${remote%:*}
-        check_port $RET_PORT || fmt_fatal invalid port number \"$RET_PORT\"
     fi
     # presets -- match domain
     local domain=${remote##*.}
     local host=${remote%.*}
     # if there's no dot
-    if [[ "$host" == "$domain" && "$host" != "["*"]" ]]; then
+    if [[ "$host" == "$domain" ]]; then
         domain="ibd"
     fi
     case $domain in
-        i|ibd )
-            RET_HOSTNAME=$host.ibd.ink
+        ibd|ebd )
+            RET_HOSTNAME=$host.$domain.ink
             RET_PORT=${RET_PORT:-12022}
             RET_USERNAME=${RET_USERNAME:-root}
             RET_TRUST_SERVER=1