Revert "ugly patch 320a8c26c0
?diff=unified"
This reverts commit 5ec8930a6f
.
This commit is contained in:
parent
5ec8930a6f
commit
babaddf7e4
|
@ -1,33 +0,0 @@
|
|||
--- onehost_helper.rb 2019-02-09 11:13:40.592653423 +0100
|
||||
+++ lib/one/ruby/cli/one_helper/onehost_helper.rb 2019-02-09 11:13:48.820708340 +0100
|
||||
@@ -349,7 +349,7 @@
|
||||
sync_cmd = "rsync -Laz --delete #{REMOTES_LOCATION}" <<
|
||||
" #{host['NAME']}:#{remote_dir}"
|
||||
else
|
||||
- sync_cmd = "scp -rp #{REMOTES_LOCATION}/. " <<
|
||||
+ sync_cmd = "scp -rp #{REMOTES_LOCATION}/* " <<
|
||||
"#{host['NAME']}:#{remote_dir} 2> /dev/null"
|
||||
end
|
||||
|
||||
--- one_im_exec.rb 2019-02-09 11:14:41.809061980 +0100
|
||||
+++ lib/one/mads/one_im_exec.rb 2019-02-09 11:14:45.981089826 +0100
|
||||
@@ -74,7 +74,7 @@
|
||||
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:
|
||||
--- CommandManager.rb 2019-02-09 11:14:53.877142524 +0100
|
||||
+++ lib/one/ruby/CommandManager.rb 2019-02-09 11:15:07.325232276 +0100
|
||||
@@ -268,7 +268,7 @@
|
||||
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}"
|
|
@ -81,10 +81,4 @@ echo
|
|||
EchoGras "Mise à jour de la base de données ONE"
|
||||
echo
|
||||
updateDB
|
||||
# FIXME ugly patch
|
||||
grep -q "\/\." /usr/lib/one/ruby/CommandManager.rb
|
||||
if [ $? = 0 ]; then
|
||||
cd /usr
|
||||
patch -fp0 < /usr/share/eole/one.patch
|
||||
fi
|
||||
exit ${?}
|
||||
|
|
Loading…
Reference in New Issue