From: Mischa POSLAWSKY <perl@shiar.org>
Date: Mon, 16 Mar 2015 18:32:58 +0000 (+0100)
Subject: font: mkttfinfo: strip file extensions from name
X-Git-Tag: v1.7~13
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/2cc9d0ed0900758dd5c64e3f87c88f40bd8897f6

font: mkttfinfo: strip file extensions from name
---

diff --git a/tools/mkttfinfo b/tools/mkttfinfo
index 9679f1c..988fcdc 100755
--- a/tools/mkttfinfo
+++ b/tools/mkttfinfo
@@ -42,7 +42,7 @@ for ($outfile || ()) {
 		exit 65; # EX_DATAERR
 	};
 
-	my $ttfname = ($ttfuri =~ m{([^/.]+) (?:[.]ttf)? \z}msx)[0];
+	my ($ttfname, @ttfext) = split /\./, ($ttfuri =~ m{([^/]+)\z}ms)[0];
 	my $ttfmeta = $ttf->{name}->read;
 	my %meta = (
 		source   => abs_path($ttfuri) =~ m{(^/usr/.+ | [^/]+) \z}msx,
@@ -66,7 +66,7 @@ for ($outfile || ()) {
 	say '+', pp(\%meta), ',';
 
 	my $support = $ttf->{cmap}->find_ms->{val};
-	warn scalar keys %$support, " characters read from $ttfname\n"
+	warn scalar keys %$support, " characters read from $ttfuri\n"
 		if $opt{verbose};
 	say pp(sort { $a <=> $b } keys %$support);
 }