diff --git a/config-home.sh b/config-home.sh index acbf2d6..93faa1e 100755 --- a/config-home.sh +++ b/config-home.sh @@ -5,7 +5,7 @@ then SourcePath=$1 else echo "Usage: setup.sh [Config-Source-Path] [User-Home-Path]" - read -p "Enter config source path (leave blank for [Users/luk.lu]/faronear/fon/sysconfig/nixhome) >> " SourcePath + read -p "Enter config source path (leave blank for [/Users/luk.lu]/faronear/fon/sysconfig/nixhome) >> " SourcePath if [ ! $SourcePath ] then echo "Use default source path: [Users/luk.lu]/faronear/fon/sysconfig/nixhome" @@ -39,11 +39,8 @@ else homescriptlist=".emacs .emacs.lisp .bashrc .bash_profile .gitignore" for homescript in $homescriptlist do - if [ -e $homescript ] # .emacs.lisp is a folder! Therefore use -e instead of -f - then - rm -fr $homescript.backup - mv $homescript $homescript.backup - fi + rm -fr $homescript.backup + mv $homescript $homescript.backup ln -s $SourcePath/$homescript $HomePath done popd diff --git a/expect-deploy.sh b/expect-deploy.sh index 6812e1e..4679e79 100755 --- a/expect-deploy.sh +++ b/expect-deploy.sh @@ -1,18 +1,15 @@ #!/usr/bin/expect -## Usage: expect this.sh [user@hostname] [filepath] [password] -## Example: expect this.sh adot@m1.bittic.net /faronear/tic/star.core.torm 密码 +# Usage: expect this.sh [0:hostname] [1:username] [2:filepath] [3:pwdadot] -set timeout 30 -spawn ssh [lindex $argv 0] +set timeout 10 +spawn ssh [lindex $argv 1]@[lindex $argv 0] -p 22 expect { - "(yes/no)?" + "yes/no" {send "yes\n";exp_continue} "password:" - {send "[lindex $argv 2]\n"} + {send "[lindex $argv 3]\n";exp_continue} ":~" - {send "su\n";exp_continue} - "Password:" - {send "[lindex $argv 2]\ncd [lindex $argv 1] && git pull && npx pm2 restart all && npx pm2 log\n"} + {send "cd [lindex $argv 2] && sudo git pull && sudo npx pm2 restart all && sudo npx pm2 log\n"} } interact diff --git a/expect-ssh.sh b/expect-ssh.sh index 40384aa..3b2091b 100755 --- a/expect-ssh.sh +++ b/expect-ssh.sh @@ -1,8 +1,8 @@ #!/usr/bin/expect -# Usage: expect this.sh [hostname] [username] [pwdadot] [pwdroot] +# Usage: expect this.sh [0:hostname] [1:username] [2:pwdadot] [3:pwdroot] -set timeout 30 +set timeout 10 spawn ssh [lindex $argv 1]@[lindex $argv 0] -p 22 expect { "yes/no"