Fix SCP remote path for binary backup download

diff --git a/bin/ros-diff.sh b/bin/ros-diff.sh
index 3533d726c156a06e3a974dcc415fd389082b822e..5e7a65bb67c70f405855e552860c8d67837d512c 100755 (executable)
--- a/bin/ros-diff.sh
+++ b/bin/ros-diff.sh
@@ -211,6 +211,7 @@ get_connections_str() {
     local host
     local ssh_cmd
     local scp_cmd
+    local remote_login
 
 # Require router-specific SSH key
     if [ -n "$DEFAULT_SSH_KEY" ]; then
@@ -250,15 +251,16 @@ get_connections_str() {
 
     if [ -n "${SSHuser}" ]; then
         ssh_cmd+=("-l" "${SSHuser}")
-        scp_cmd+=("${SSHuser}@${host}")
+        remote_login="${SSHuser}@${host}"
     else
         ssh_cmd+=("-l" "${DEFAULT_SSH_USER}")
-        scp_cmd+=("${DEFAULT_SSH_USER}@${host}")
+        remote_login="${DEFAULT_SSH_USER}@${host}"
     fi
 
     ssh_cmd+=("${host}")
     SSH_CMD=("${ssh_cmd[@]}")
     SCP_CMD=("${scp_cmd[@]}")
+    SCP_REMOTE="${remote_login}"
 #SFTP_STR="${sftp_str[*]}"
 #SFTP_OPTS="-i ${DEFAULT_SSH_KEY} -o PasswordAuthentication=no -oPort=${SSHport}"
 }
@@ -396,7 +398,7 @@ backup_binary() {
 
         log_msg="- Start download ${bin_tmp} file to ${BackupDir}..."
         log_info "${log_msg}"
-        "${SCP_CMD[@]}" ":/${bin_tmp}" "${bin_file}" & pid=$!
+        "${SCP_CMD[@]}" "${SCP_REMOTE}:/${bin_tmp}" "${bin_file}" & pid=$!
         spinstr "$pid"
         wait "$pid"
         rc=$?
@@ -502,7 +504,7 @@ if compare_config ${current_config} ${precedent_config} ${diff_config} ${RouterN
 
     ${CMD_MV} -f "${current_config}" "${precedent_config}"
 
-    log_msg="- Copy configuration to ${BackupDir}/${save_config} and ${precedent_config} success."
+    log_msg="- Copy configuration to ${save_config} and ${precedent_config} success."
     log_success "${log_msg}"
 
     backup_binary "${save_backup}" "${backup_pass}"