nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix `tootctl media remove-orphans` ignoring `PAPERCLIP_ROOT_PATH` (#13375) 

Fix #13371
This commit is contained in:
Eugen Rochko 2020-04-02 05:28:51 +02:00 committed by GitHub
parent c3965e28b3
commit a9a063c0e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mastodon/media_cli.rb
View File

@ -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)