diff --git a/move_site.sh b/move_site.sh index 4196fc2..1bdc2a7 100644 --- a/move_site.sh +++ b/move_site.sh @@ -25,6 +25,8 @@ if [[ ! -z "$9" ]]; then if [[ -z "$new_server_port" ]]; then new_server_port="80"; fi + else + new_server_port="80"; fi fi domain_escape=`echo $domain|sed 's/\./\\\./g'`; @@ -38,7 +40,7 @@ else ssh_command="sshpass -p $pass ssh $user@$ip -p $port"; scp_command="sshpass -p $pass scp -r -P $port $user@$ip:"; scan_ssh_keys=`ssh-keyscan -H $ip -p $port` - if [ -z "$(grep -w "$scan_ssh_keys" ~/.ssh/known_hosts)" ]; then + if [[ ! -e ~/.ssh/known_hosts ]] || [[ -z "$(grep -w "$scan_ssh_keys" ~/.ssh/known_hosts)" ]]; then echo "$scan_ssh_keys" >> ~/.ssh/known_hosts fi use_local_command="" diff --git a/move_site_interactive.sh b/move_site_interactive.sh index 15c17b7..dcf21ad 100644 --- a/move_site_interactive.sh +++ b/move_site_interactive.sh @@ -28,6 +28,8 @@ if [[ ! -z "$tmp" ]]; then if [[ -z "$new_server_port" ]]; then new_server_port="80"; fi + else + new_server_port="80"; fi fi tmp=""; @@ -42,7 +44,7 @@ else ssh_command="sshpass -p $pass ssh $user@$ip -p $port"; scp_command="sshpass -p $pass scp -r -P $port $user@$ip:"; scan_ssh_keys=`ssh-keyscan -H $ip -p $port` - if [ -z "$(grep -w "$scan_ssh_keys" ~/.ssh/known_hosts)" ]; then + if [[ ! -e ~/.ssh/known_hosts ]] || [[ -z "$(grep -w "$scan_ssh_keys" ~/.ssh/known_hosts)" ]]; then echo "$scan_ssh_keys" >> ~/.ssh/known_hosts fi use_local_command=""