This commit is contained in:
Michael Stanclift
2020-06-01 13:50:58 -05:00
parent f1cac14713
commit 4e4ddd56d1

View File

@ -596,7 +596,7 @@ function validate_os_sshpass {
elif hash dbclient 2>/dev/null elif hash dbclient 2>/dev/null
then then
# if [ "$SSH_CMD" = "dbclient" ]; then echo ''; fi; # if [ "$SSH_CMD" = "dbclient" ]; then echo ''; fi;
timeout 5 ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i '$HOME/${SSH_PKIF}' ${REMOTE_USER}@${REMOTE_HOST} 'exit' >/dev/null 2>&1 timeout 5 ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} 'exit' >/dev/null 2>&1
error_validate error_validate
fi fi
} }
@ -664,17 +664,17 @@ function distro_check {
## Detect SSH & RSYNC ## Detect SSH & RSYNC
function detect_ssh { function detect_ssh {
MESSAGE="Validating SSH Command on $HOSTNAME" MESSAGE="Validating SSH on $HOSTNAME"
echo_stat echo_stat
if hash ssh 2>/dev/null if hash ssh 2>/dev/null
then then
MESSAGE="Validating SSH Command on $HOSTNAME (OpenSSH)" MESSAGE="Validating SSH on $HOSTNAME (OpenSSH)"
echo_good echo_good
SSH_CMD='ssh' SSH_CMD='ssh'
elif hash dbclient 2>/dev/null elif hash dbclient 2>/dev/null
then then
MESSAGE="Validating SSH Command on $HOSTNAME (Dropbear)" MESSAGE="Validating SSH on $HOSTNAME (Dropbear)"
echo_good echo_good
SSH_CMD='dbclient' SSH_CMD='dbclient'
else else
@ -689,7 +689,7 @@ function detect_ssh {
error_validate error_validate
fi fi
MESSAGE="Validating RSYNC Client on $HOSTNAME" MESSAGE="Validating RSYNC on $HOSTNAME"
echo_stat echo_stat
if hash rsync 2>/dev/null if hash rsync 2>/dev/null