@@ -168,13 +168,27 @@ module Engines raise "Could not copy #{file} to #{target}: \n" + e end end - end + end - def mirror_by_symlinking(source, destination) - FileUtils.mkdir_p(File.dirname(destination)) - logger.warn "symlinking #{source} into #{destination}" - return unless File.directory?(source) - system "ln -nsf #{source} #{destination}" + # Create a symbolical link from (+source+) to (+destination+), falling back to recursive + # copying on non-supporting platforms + def symlink_or_mirror(source, destination) + parent_directory = File.dirname(destination) + unless File.exist?(parent_directory) + FileUtils.mkdir_p(parent_directory) + end + if File.exist?(destination) + if File.symlink?(destination) + File.delete(destination) + File.symlink(source, destination) + else + mirror_files_from(source, destination) + end + else + unless File.symlink(source, destination) # returns nil on non-supporting platforms + mirror_files_from(source, destination) + end + end end end end \ No newline at end of file lib/engines.rb @@ -27,7 +27,7 @@ should edit the files within the <plugin_name>/assets/ directory itself.} return if plugin.public_directory.nil? begin Engines.logger.debug "Attempting to copy plugin assets from '#{plugin.public_directory}' to '#{Engines.public_directory}'" - Engines.mirror_by_symlinking(plugin.public_directory, File.join(Engines.public_directory, plugin.name)) + Engines.symlink_or_mirror(plugin.public_directory, File.join(Engines.public_directory, plugin.name)) rescue Exception => e Engines.logger.warn "WARNING: Couldn't create the public file structure for plugin '#{plugin.name}'; Error follows:" Engines.logger.warn e lib/engines/assets.rb 982f350a9c31d1233a5d9d746ad6cff37b591a0c yar yar@laptop http://github.com/yar/engines/commit/2bfbe08547d0ede6a25cca846bb970010b7b561e 2bfbe08547d0ede6a25cca846bb970010b7b561e 2008-05-02T12:26:05-07:00 2008-05-02T12:26:05-07:00 Falling back to recursive asset copying when symbolical links are not supported 6aea2e90bceb3b8286ad16d9df298e734339424e yar yar@laptop