@@ -18,13 +18,8 @@ Please feel free to contribute to this script and I'll accept any changes for th A few things are required for this script to function correctly. * Ruby 1.8.x * rsync 3.0.x - * open4 ruby gem * ssh command -To install the open4 gem run: - - sudo gem install open4 - Rsync on OS X 10.5: On OS X 10.5 the default rsync is out of date and missing a few used options you may use macports to install the latest. README @@ -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 9ab24881480eceec49d4b7c12287a0d6e8f73989 Richard Grundy rich@27smiles.com http://github.com/RichGuk/rrsync/commit/d08a60e2d3f106a17933479a281dfc3264897b04 d08a60e2d3f106a17933479a281dfc3264897b04 2008-08-19T05:39:38-07:00 2008-08-19T05:39:38-07:00 Removed the need for open4 as it was pointless, using the standard open3. be309e8df6204c878713801db88f6a20fda5491c Richard Grundy rich@27smiles.com