From 18635ec5c3ecb0fba684b083bff1fa8c2f5e0d1f Mon Sep 17 00:00:00 2001 From: Andrew Gerrand Date: Wed, 5 Aug 2015 16:22:07 +1000 Subject: [PATCH] godoc/static: tweak regular expression to match old darwin builds Change-Id: I74020ece0cf8b4aceb60d75475500569d08416ee Reviewed-on: https://go-review.googlesource.com/13211 Reviewed-by: Andrew Gerrand --- godoc/static/godocs.js | 4 ++-- godoc/static/static.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/godoc/static/godocs.js b/godoc/static/godocs.js index 997616c4..7fa805fc 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 a4b34512..f2517091 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(); }