forked from cybrespace/mastodon
Fix `tootctl media remove-orphans` ignoring `PAPERCLIP_ROOT_PATH` (#13375)
Fix #13371
This commit is contained in:
parent
c3965e28b3
commit
a9a063c0e9
|
@ -115,7 +115,7 @@ module Mastodon
|
||||||
when :filesystem
|
when :filesystem
|
||||||
require 'find'
|
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|
|
Find.find(File.join(*[root_path, prefix].compact)) do |path|
|
||||||
next if File.directory?(path)
|
next if File.directory?(path)
|
||||||
|
|
Loading…
Reference in New Issue