aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Gerrand <adg@golang.org>2015-09-01 22:26:27 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-09-01 22:26:27 +0000
commit53091937714852364440ce4966d5457ad7e25e98 (patch)
tree7edfb61d17b1a66d9d209b80d7c0e4d1ba3cc355
parentd8ebf21e8ef15dac4b63bfae2821f2717b800ca8 (diff)
parent7e0ad01d16aa99fd5a2eb43531862cf7ec5acee3 (diff)
downloadtools-53091937714852364440ce4966d5457ad7e25e98.tar.gz
godoc/static: tweak regular expression to match source builds
automerge: 7e0ad01 * commit '7e0ad01d16aa99fd5a2eb43531862cf7ec5acee3': godoc/static: tweak regular expression to match source builds
-rw-r--r--godoc/static/godocs.js2
-rw-r--r--godoc/static/static.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/godoc/static/godocs.js b/godoc/static/godocs.js
index 7fa805f..47d1de9 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]+)(-osx10\.[68])?\.([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);
diff --git a/godoc/static/static.go b/godoc/static/static.go
index f251709..3009e24 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]+)(-osx10\.[68])?\.([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);