@@ -1,9 +1,10 @@ #!/usr/bin/ruby require 'rubygems' require 'Logger' -require 'open4' require 'benchmark' require 'ping' +require 'FileUtils' +require 'open3' #============================= OPTIONS ==============================# # == Options for local machine. @@ -46,13 +47,13 @@ run_time = Benchmark.realtime do raise Exception, "Unable to find remote host (#{SSH_SERVER})" unless Ping.pingecho(SSH_SERVER) FileUtils.mkdir("#{EMPTY_DIR}") unless File.exist?("#{EMPTY_DIR}") - Open4::popen4("#{rsync_cleanout_cmd}") { |pid, stdin, stdout, stderr| + Open3::popen3("#{rsync_cleanout_cmd}") { |stdin, stdout, stderr| tmp_stdout = stdout.read.strip tmp_stderr = stderr.read.strip logger.info("#{rsync_cleanout_cmd}\n#{tmp_stdout}") unless tmp_stdout == '' logger.error("#{rsync_cleanout_cmd}\n#{tmp_stderr}") unless tmp_stderr == '' } - Open4::popen4("#{rsync_cmd}") { |pid, stdin, stdout, stderr| + Open3::popen3("#{rsync_cmd}") { |stdin, stdout, stderr| tmp_stdout = stdout.read.strip tmp_stderr = stderr.read.strip logger.info("#{rsync_cmd}\n#{tmp_stdout}") unless tmp_stdout == '' rrsync.rb 48d109689afa9c1e32a40156754a67b60ad7d53a d08a60e2d3f106a17933479a281dfc3264897b04 Jonathan Stott jonathan.stott@gmail.com http://github.com/RichGuk/rrsync/commit/e4392f775ba2c32077e2f178544eaeaa17a91e01 e4392f775ba2c32077e2f178544eaeaa17a91e01 2008-08-19T05:42:48-07:00 2008-08-19T05:42:48-07:00 Merged in popen changes from Rich's master c982ad7a627dd7576ee5e98a255407590063bd59 Jonathan Stott jonathan.stott@gmail.com