github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-29 04:10:29 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Don't fail when there's no directory to strip

Browse Source
This commit is contained in:
romanrizzi 2019-10-10 11:21:36 -03:00
parent c5326682d6
commit fa66290b61
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/compression/strategy.rb
View File

@ -33,8 +33,10 @@ module Compression
end end
def strip_directory(from, to, relative: false) def strip_directory(from, to, relative: false)
sanitized_from = sanitize_path(from) sanitized_from = sanitize_path(from) rescue nil
sanitized_to = sanitize_path(to) sanitized_to = sanitize_path(to) rescue nil
return unless sanitized_from && sanitized_to
glob_path = relative ? "#{sanitized_from}/*/*" : "#{sanitized_from}/**" glob_path = relative ? "#{sanitized_from}/*/*" : "#{sanitized_from}/**"
FileUtils.mv(Dir.glob(glob_path), sanitized_to) if File.directory?(sanitized_from) FileUtils.mv(Dir.glob(glob_path), sanitized_to) if File.directory?(sanitized_from)
end end