From 6ec4069e9b769bc8ec858a348bf673cece05130d Mon Sep 17 00:00:00 2001
From: Devin Christensen <quixoten@gmail.com>
Date: Wed, 13 Feb 2019 05:37:01 -0700
Subject: [PATCH] development: Fix "scp: error: unexpected filename: ."

(cherry picked from commit 320a8c26c0c455edfdc5ea87ae2fad38817ee856)
---
 src/cli/one_helper/onehost_helper.rb | 4 ++--
 src/im_mad/im_exec/one_im_exec.rb    | 2 +-
 src/mad/ruby/CommandManager.rb       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cli/one_helper/onehost_helper.rb b/src/cli/one_helper/onehost_helper.rb
index 5f0f0a4c67..db893cc2bf 100644
--- a/src/cli/one_helper/onehost_helper.rb
+++ b/src/cli/one_helper/onehost_helper.rb
@@ -349,8 +349,8 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
                         sync_cmd = "rsync -Laz --delete #{REMOTES_LOCATION}" <<
                             " #{host['NAME']}:#{remote_dir}"
                     else
-                        sync_cmd = "scp -rp #{REMOTES_LOCATION}/. " <<
-                            "#{host['NAME']}:#{remote_dir} 2> /dev/null"
+                        sync_cmd = "scp -rp #{REMOTES_LOCATION}/* " \
+                                   "#{host['NAME']}:#{remote_dir} 2> /dev/null"
                     end
 
                     `#{sync_cmd} 2>/dev/null`
diff --git a/src/im_mad/im_exec/one_im_exec.rb b/src/im_mad/im_exec/one_im_exec.rb
index 11028dc184..9a1c269e48 100755
--- a/src/im_mad/im_exec/one_im_exec.rb
+++ b/src/im_mad/im_exec/one_im_exec.rb
@@ -74,7 +74,7 @@ class InformationManagerDriver < OpenNebulaDriver
         if !action_is_local?(:MONITOR)
             if do_update == "1" || @options[:force_copy]
                 # Use SCP to sync:
-                sync_cmd = "scp -r #{@local_scripts_base_path}/. " \
+                sync_cmd = "scp -r #{@local_scripts_base_path}/* " \
                     "#{host}:#{@remote_scripts_base_path}"
 
                 # Use rsync to sync:
diff --git a/src/mad/ruby/CommandManager.rb b/src/mad/ruby/CommandManager.rb
index 930f2a6334..288a7a53ac 100644
--- a/src/mad/ruby/CommandManager.rb
+++ b/src/mad/ruby/CommandManager.rb
@@ -268,7 +268,7 @@ private
         SSHCommand.run("mkdir -p #{remote_dir}",host,logger)
 
         # Use SCP to sync:
-        sync_cmd = "scp -rp #{REMOTES_LOCATION}/. #{host}:#{remote_dir}"
+        sync_cmd = "scp -rp #{REMOTES_LOCATION}/* #{host}:#{remote_dir}"
 
         # Use rsync to sync:
         # sync_cmd = "rsync -Laz #{REMOTES_LOCATION} #{host}:#{@remote_dir}"