diff --git a/config/initializers/image_uploads.rb b/config/initializers/image_uploads.rb index faa7d22..2d87131 100644 --- a/config/initializers/image_uploads.rb +++ b/config/initializers/image_uploads.rb @@ -1,7 +1,7 @@ if File.writable?(Rails.root) - misplaced_directories = Dir.glob(Rails.root + '/public/images/[0-9]*') + misplaced_directories = Dir.glob(Rails.root.join('public/images/[0-9]*')) unless misplaced_directories.empty? - new_location = Rails.root + '/public/image_uploads' + new_location = Rails.root.join('public/image_uploads') if !File.exists?(new_location) FileUtils.mkdir(new_location) end diff --git a/lib/tasks/gettext.rake b/lib/tasks/gettext.rake index 2af89f5..5f2270e 100644 --- a/lib/tasks/gettext.rake +++ b/lib/tasks/gettext.rake @@ -22,11 +22,11 @@ task :symlinkmo do langmap = { 'pt' => 'pt_BR', } - FileUtils.mkdir_p(Rails.root + '/locale') - Dir.glob(Rails.root + '/locale/*').each do |dir| + mkdir_p(File.join(Rails.root, 'locale')) + Dir.glob(File.join(Rails.root, 'locale/*')).each do |dir| lang = File.basename(dir) orig_lang = langmap[lang] || lang - FileUtils.mkdir_p("#{Rails.root}/locale/#{lang}/LC_MESSAGES") + mkdir_p("#{Rails.root}/locale/#{lang}/LC_MESSAGES") ['iso_3166', 'rails'].each do |domain| origin = "/usr/share/locale/#{orig_lang}/LC_MESSAGES/#{domain}.mo" target = "#{Rails.root}/locale/#{lang}/LC_MESSAGES/#{domain}.mo" -- libgit2 0.21.2