.gitconfig2

@@ -9,8 +9,6 @@
     quotepath = false  # chinese chars
 [push]
     autoSetupRemote = true
-[pull]
-    ff = only
 [branch]
     # Show most recently changed branches first.
     sort = -committerdate

riot-config.sh

@@ -8,18 +8,7 @@ j.remote() {
     RET_TRUST_SERVER=1
 }
 
-nasp.remote() {
-    remote=nasp.ob.ac.cn
-    RET_PORT=${RET_PORT:-36022}
-    RET_USERNAME=${RET_USERNAME:-ssh}
-    RET_TRUST_SERVER=1
-}
-
 # domains
-.domain() {
-    RET_USERNAME=${RET_USERNAME:-root}
-}
-
 i.domain() {
     RET_HOSTNAME=$host.ibd.ink
     RET_PORT=${RET_PORT:-12022}

scripts/riot

@@ -163,18 +163,6 @@ run_sshl()
     eval_or_echo $cmd
 }
 
-# sshd
-run_sshd()
-{
-    local port=$(get_free_port)
-
-    SSH_OPTIONS="$SSH_OPTIONS -NC -D $port"
-    local cmd="$(prepare_ssh_cmd ssh)"
-    fmt_note "-->" $cmd
-    fmt_note "  > please access localhost:$port"
-    eval_or_echo $cmd
-}
-
 # scp
 run_scp() {
     local src="$1"
@@ -240,9 +228,6 @@ router() {
                 test -n "$3" || fmt_fatal "no target address provided"
                 run_sshl "$3"
                 ;;
-            sshd )
-                run_sshd
-                ;;
             scp )
                 test -n "$3" || fmt_fatal "no source path specified"
                 test -n "$4" || fmt_fatal "no destination path specified"

tools/test.zsh

@@ -38,7 +38,7 @@ test $(echo n | tools/common.sh ask_for_yN "test") = "0"
 test $(echo | tools/common.sh ask_for_yN "test") = "0"
 test $(echo | tools/common.sh ask_for_Yn "test") = "1"
 test $(DFS_QUIET=1 tools/common.sh ask_for_Yn "test") = "1"
-test "$(DFS_TRUST=1 riot time@is.impt:2222/yes@you-r.right/you@are.really.recht./ibd./try@it,another@host scp /tmp/ ./tmp -D 2>/dev/null)" = 'scp -P 12022 -o ControlMaster=auto -o ControlPath=/tmp/sshcm-%C -o PermitLocalCommand=yes -o ProxyJump=time@is.impt:2222,yes@you-r.right,you@are.really.recht.,root@ibd. -r try@it.ibd.ink:"/tmp/" "./tmp"
+test "$(DFS_TRUST=1 riot time@is.impt:2222/yes@you-r.right/you@are.really.recht./ibd./try@it,another@host scp /tmp/ ./tmp -D 2>/dev/null)" = 'scp -P 12022 -o ControlMaster=auto -o ControlPath=/tmp/sshcm-%C -o PermitLocalCommand=yes -o ProxyJump=time@is.impt:2222,yes@you-r.right,you@are.really.recht.,ibd. -r try@it.ibd.ink:"/tmp/" "./tmp"
 scp -P 12022 -o ControlMaster=auto -o ControlPath=/tmp/sshcm-%C -o PermitLocalCommand=yes -o ForwardX11=yes -o ForwardAgent=yes -r another@host.ibd.ink:"/tmp/" "./tmp"'
 
 # check alias