@@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- require "#{File.dirname(__FILE__)}/../../lib/handsoap/parser.rb" require "#{File.dirname(__FILE__)}/../../lib/handsoap/compiler.rb" +require 'pathname' # TODO # options: @@ -75,11 +76,7 @@ module Handsoap #:nodoc: def file_contents(relative_destination, &block) destination = destination_path(relative_destination) temp_file = Tempfile.new("handsoap_generator") - if RUBY_PLATFORM =~ /linux/ - canonical_path = `readlink -fn '#{source_path("/.")}'` - else - canonical_path = File.expand_path(source_path("/.")) - end + canonical_path = Pathname.new(source_path("/.")).realpath.to_s temp_file_relative_path = relative_path(temp_file.path, canonical_path) begin yield temp_file generators/handsoap/handsoap_generator.rb e406c4abd4a5d1c49ffe831bc3e70251e0a9ad09 Troels tkn@tkn-laptop.(none) http://github.com/troelskn/handsoap/commit/202ea55d4de7ec837b15c62a2be26ada1737a95e 202ea55d4de7ec837b15c62a2be26ada1737a95e 2009-07-12T04:45:09-07:00 2009-07-12T04:45:09-07:00 Replaced shell call to readlink with library pathname.realpath 6d913576d71e8344a5aafed6573370eee6ee97da Troels tkn@tkn-laptop.(none)