From 13d91792e03cc64e53d9a874970f8e60ab91b8f1 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Wed, 3 Jun 2020 14:44:49 -0500 Subject: [PATCH] Silence dbclient --- CHANGELOG.md | 4 ++-- gravity-sync.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63aa32b..14ecb31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,8 +15,8 @@ - SSH/RSYNC connection logic rewritten to be specific to client options between OpenSSH, OpenSSH w/ SSHPASS, and Dropbear. - Removes INFO that SSHPASS is not installed during config, if it's not needed. Redirects user to documentation. - Better error handling of configuration options. -- Adds custom port specification to ssh-copy-id command during configuration generation. -- OpenSSH key generation works with fewer user prompts. +- Adds custom port specification to ssh-copy-id and dropbearkey commands during configuration generation. +- Key generation works with fewer no user prompts. #### 1.7.7 - `config` function will attempt to ping remote host to validate network connection, can by bypassed by adding `PING_AVOID='1'` to your `gravity-sync.conf` file. diff --git a/gravity-sync.sh b/gravity-sync.sh index 7edddc7..396ea74 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -757,8 +757,8 @@ function export_sshkey { ssh-copy-id -f -p ${SSH_PORT} -i $HOME/${SSH_PKIF}.pub ${REMOTE_USER}@${REMOTE_HOST} elif hash dbclient 2>/dev/null then - dropbearkey -y -f $HOME/${SSH_PKIF} | grep "^ssh-rsa " > $HOME/${SSH_PKIF}.pub - cat $HOME/${SSH_PKIF}.pub | dbclient ${REMOTE_USER}@${REMOTE_HOST} 'cat - >> .ssh/authorized_keys' + dropbearkey -f $HOME/${SSH_PKIF} | grep "^ssh-rsa " > $HOME/${SSH_PKIF}.pub + cat $HOME/${SSH_PKIF}.pub | dbclient -p ${SSH_PORT} -y ${REMOTE_USER}@${REMOTE_HOST} 'cat - >> .ssh/authorized_keys' fi else MESSAGE="Error Registering Key-Pair"