aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Gerrand <adg@golang.org>2015-09-01 22:26:24 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-09-01 22:26:24 +0000
commitd8ebf21e8ef15dac4b63bfae2821f2717b800ca8 (patch)
treeffa58c344e9f30ccbcc9d14173ce084a56a864d6
parent49b22efd2d498ef29baf3031b5aa52fd7d6205cf (diff)
parent18635ec5c3ecb0fba684b083bff1fa8c2f5e0d1f (diff)
downloadtools-d8ebf21e8ef15dac4b63bfae2821f2717b800ca8.tar.gz
godoc/static: tweak regular expression to match old darwin builds
automerge: 18635ec * commit '18635ec5c3ecb0fba684b083bff1fa8c2f5e0d1f': godoc/static: tweak regular expression to match old darwin builds
-rw-r--r--godoc/static/godocs.js4
-rw-r--r--godoc/static/static.go4
2 files changed, 4 insertions, 4 deletions
diff --git a/godoc/static/godocs.js b/godoc/static/godocs.js
index 997616c..7fa805f 100644
--- a/godoc/static/godocs.js
+++ b/godoc/static/godocs.js
@@ -254,7 +254,7 @@ function personalizeInstallInstructions() {
}
var filename = s.substr(prefix.length);
- var filenameRE = /^go1\.\d+(\.\d+)?([a-z0-9]+)?\.([a-z0-9]+)(-[a-z0-9-.]+)?\.([a-z.]+)$/;
+ var filenameRE = /^go1\.\d+(\.\d+)?([a-z0-9]+)?\.([a-z0-9]+)-([a-z0-9]+)(-osx10\.[68])?\.([a-z.]+)$/;
$('.downloadFilename').text(filename);
$('.hideFromDownload').hide();
var m = filenameRE.exec(filename);
@@ -264,7 +264,7 @@ function personalizeInstallInstructions() {
}
var os = m[3];
- var ext = m[5];
+ var ext = m[6];
if (ext != 'tar.gz') {
$('#tarballInstructions').hide();
}
diff --git a/godoc/static/static.go b/godoc/static/static.go
index a4b3451..f251709 100644
--- a/godoc/static/static.go
+++ b/godoc/static/static.go
@@ -819,7 +819,7 @@ function personalizeInstallInstructions() {
}
var filename = s.substr(prefix.length);
- var filenameRE = /^go1\.\d+(\.\d+)?([a-z0-9]+)?\.([a-z0-9]+)(-[a-z0-9-.]+)?\.([a-z.]+)$/;
+ var filenameRE = /^go1\.\d+(\.\d+)?([a-z0-9]+)?\.([a-z0-9]+)-([a-z0-9]+)(-osx10\.[68])?\.([a-z.]+)$/;
$('.downloadFilename').text(filename);
$('.hideFromDownload').hide();
var m = filenameRE.exec(filename);
@@ -829,7 +829,7 @@ function personalizeInstallInstructions() {
}
var os = m[3];
- var ext = m[5];
+ var ext = m[6];
if (ext != 'tar.gz') {
$('#tarballInstructions').hide();
}