From 49f032c3a1a5d2feb1215ff2f437ab3b82ca4beb Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Wed, 4 Feb 2015 18:40:41 +0100
Subject: [PATCH] browser: move generated include files into data/browser/

Avoid polluting the root dir with various historic options.
---
 .gitignore  | 2 ++
 browser.plp | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 227df11..e503b91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,8 @@
 	# tools/convert-allfonts
 /unicode-cover.inc.pl
 	# tools/mkfontinfo
+/data/browser/
+	# tools/mkcaniuse tools/mkusage-wikimedia tools/mkusage-statcounter
 
 # site owner tag for google webmaster tools
 /google????????????????.html
diff --git a/browser.plp b/browser.plp
index 7355aa7..04599d0 100644
--- a/browser.plp
+++ b/browser.plp
@@ -16,12 +16,12 @@ Html({
 		ie internet explorer firefox chrome safari webkit opera
 	'],
 	stylesheet => [qw'circus dark mono red light'],
-	data => ['browser-support.inc.pl'],
+	data => ['data/browser/support.inc.pl'],
 });
 
 say "<h1>Browser compatibility</h1>\n";
 
-my $caniuse = do 'browser-support.inc.pl' or die $! || $@;
+my $caniuse = do 'data/browser/support.inc.pl' or die $! || $@;
 $_->{verrelease} = {
 	# mark last three (future) versions as unreleased, ensure current isn't
 	map {
@@ -87,11 +87,11 @@ given ($get{usage} // 'wm') {
 	when (!$_) {
 		# none
 	}
-	when (!/^[a-z][\w-]+$/) {
+	when (!m{ \A [a-z]\w+ (?:/\d[\d-]*\d)? \z }x) {
 		printf "<p>Invalid browser usage data request: <em>%s</em>",
 			'identifier must be alphanumeric name or <q>0</q>';
 	}
-	$canihas = do "browser-usage-$_.inc.pl" or do {
+	$canihas = do "data/browser/usage-$_.inc.pl" or do {
 		printf "<p>Browser usage data not found: <em>%s</em>", $! || $@;
 		break;
 	};
-- 
2.30.0