diff --git a/deploy-expect.sh b/expect-deploy.sh
similarity index 60%
rename from deploy-expect.sh
rename to expect-deploy.sh
index 17fafe1..dc4af88 100644
--- a/deploy-expect.sh
+++ b/expect-deploy.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/expect
 
-## Usage: expect this.sh [user@hostname] [password] [filepath]
-## Example: expect this.sh adot@server.log.yuanjin.net /faronear/tac.log/log.server.torm
+## Usage: expect this.sh [user@hostname] [filepath] [password]
+## Example: expect this.sh adot@server.log.yuanjin.net /faronear/tac.log/log.server.torm 密码
 
 set timeout 30
 spawn ssh [lindex $argv 0]
@@ -9,10 +9,10 @@ expect {
   "(yes/no)?"
   {send "yes\n";exp_continue}
   "password:"
-  {send "[lindex $argv 1]\n"}
+  {send "[lindex $argv 2]\n"}
   ":~"
   {send "su\n";exp_continue}
   "Password:"
-  {send "[lindex $argv 1]\ncd [lindex $argv 2] && git pull && npx pm2 restart all && npx pm2 log\n"}
+  {send "[lindex $argv 2]\ncd [lindex $argv 1] && git pull && npx pm2 restart all && npx pm2 log\n"}
 }
 interact
diff --git a/ssh-expect.sh b/expect-ssh.sh
similarity index 50%
rename from ssh-expect.sh
rename to expect-ssh.sh
index 38d7fcf..8747824 100755
--- a/ssh-expect.sh
+++ b/expect-ssh.sh
@@ -1,19 +1,19 @@
 #!/usr/bin/expect
 
-# Usage: expect this.sh [hostname] [port] [username] [password]
+# Usage: expect this.sh [hostname] [username] [password]
 
 set timeout 30
-spawn ssh -p [lindex $argv 1] [lindex $argv 2]@[lindex $argv 0]
+spawn ssh [lindex $argv 1]@[lindex $argv 0] -p 22
 expect {
   "(yes/no)?"
   {send "yes\n";exp_continue}
   "password:"
-  {send "[lindex $argv 3]\n";exp_continue}
+  {send "[lindex $argv 2]\n";exp_continue}
   ":~"
   {send "su\n";exp_continue}
   "Password:"
 #  {send "[lindex $argv 3]\ncd /faronear\n"}
 #  "密码："
-  {send "[lindex $argv 3]\ncd /faronear\n"}
+  {send "[lindex $argv 2]\ncd /faronear\n"}
 }
 interact
diff --git a/git-pull-all.sh b/git-pull-all.sh
index 6f582fd..e879c31 100755
--- a/git-pull-all.sh
+++ b/git-pull-all.sh
@@ -4,7 +4,8 @@ if [ $1 ]
 then
   FONPATH=$1
 else
-  read -p "Enter faronear path to git pull (leave blank for default [/faronear] or [~/faronear] or [../..]) >> " FONPATH
+  echo Leave blank for default [/faronear], [~/faronear], [../..],
+  read -p "or enter faronear path to git pull >> " FONPATH
   if [ ! $FONPATH ]
   then
     if [ -d /faronear ]
diff --git a/npm-boot-all.sh b/npm-boot-all.sh
index 7317fa0..cbcb55c 100755
--- a/npm-boot-all.sh
+++ b/npm-boot-all.sh
@@ -4,7 +4,8 @@ if [ $1 ]
 then
   FONPATH=$1
 else
-  read -p "Enter faronear path to git pull (leave blank for default [/faronear] or [~/faronear] or [../..]) >> " FONPATH
+  echo Leave blank for default [/faronear], [~/faronear], [../..],
+  read -p "or enter faronear path to git pull >> " FONPATH
   if [ ! $FONPATH ]
   then
     if [ -d /faronear ]