]> cat aescling's git repositories - mastodon.git/commitdiff
Fix `tootctl media remove-orphans` ignoring `PAPERCLIP_ROOT_PATH` (#13375)
authorEugen Rochko <eugen@zeonfederated.com>
Thu, 2 Apr 2020 03:28:51 +0000 (05:28 +0200)
committerGitHub <noreply@github.com>
Thu, 2 Apr 2020 03:28:51 +0000 (05:28 +0200)
Fix #13371

lib/mastodon/media_cli.rb

index b4ad78fe51046d554e6fc00b6a8cb0ff17be1310..08a8f109373999be726e4c031b65383c449ffba9 100644 (file)
@@ -115,7 +115,7 @@ module Mastodon
       when :filesystem
         require 'find'
 
-        root_path = ENV.fetch('RAILS_ROOT_PATH', File.join(':rails_root', 'public', 'system')).gsub(':rails_root', Rails.root.to_s)
+        root_path = ENV.fetch('PAPERCLIP_ROOT_PATH', File.join(':rails_root', 'public', 'system')).gsub(':rails_root', Rails.root.to_s)
 
         Find.find(File.join(*[root_path, prefix].compact)) do |path|
           next if File.directory?(path)