File tree Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ def check_woff2
50
50
51
51
# Calculates a hash of vectors, options, and templates (content and filenames)
52
52
def checksum
53
- files = Dir . glob ( File . join ( @options [ :input ] [ :vectors ] , "*.svg" ) ) . select { |fn | File . file? ( fn ) }
53
+ files = Dir . glob ( File . join ( @options [ :input ] [ :vectors ] , "**/* .svg" ) ) . select { |fn | File . file? ( fn ) }
54
54
files += Dir . glob ( File . join ( @options [ :input ] [ :templates ] , "*" ) ) . select { |fn | File . file? ( fn ) }
55
55
content = files . map { |file | File . read ( file ) } . join
56
56
content << files . join
Original file line number Diff line number Diff line change @@ -47,10 +47,10 @@ def set_glyph_info
47
47
0xf100
48
48
end
49
49
50
- files = Dir . glob File . join ( @options [ :input ] [ :vectors ] , "*.svg" )
50
+ files = Dir . glob File . join ( @options [ :input ] [ :vectors ] , "**/* .svg" )
51
51
glyphs = { }
52
52
files . each do |file |
53
- name = File . basename file , ". svg"
53
+ name = file . sub ( /^ #{ @options [ :input ] [ :vectors ] } \/ ?/ , '' ) . sub ( / \. svg$/ , '' )
54
54
name = name . strip . gsub ( /\W / , "-" )
55
55
glyphs [ name . to_sym ] = { :source => file }
56
56
if File . read ( file ) . include? "rgba"
Original file line number Diff line number Diff line change @@ -119,7 +119,7 @@ def set_input_paths
119
119
@options [ :input ] = { :vectors => input , :templates => input }
120
120
end
121
121
122
- if Dir [ File . join ( @options [ :input ] [ :vectors ] , "*.svg" ) ] . empty?
122
+ if Dir . glob ( File . join ( @options [ :input ] [ :vectors ] , "**/* .svg" ) ) . empty?
123
123
raise Fontcustom ::Error , "`#{ @options [ :input ] [ :vectors ] } ` doesn't contain any SVGs."
124
124
end
125
125
end
You can’t perform that action at this time.
0 commit comments