diff --git a/internal/define/alpine.go b/internal/define/alpine.go index f375173..2ca8dca 100644 --- a/internal/define/alpine.go +++ b/internal/define/alpine.go @@ -8,7 +8,7 @@ const ALPINE_BENCHMAKR_URL = "MIRRORS.txt" // https://mirrors.alpinelinux.org/ 2022.11.19 // Sites that contain protocol headers, restrict access to resources using that protocol -var ALPINE_OFFICAL_MIRRORS = []string{ +var ALPINE_OFFICIAL_MIRRORS = []string{ "mirrors.tuna.tsinghua.edu.cn/alpine/", "mirrors.ustc.edu.cn/alpine/", "mirrors.nju.edu.cn/alpine/", @@ -21,7 +21,7 @@ var ALPINE_OFFICAL_MIRRORS = []string{ var ALPINE_CUSTOM_MIRRORS = []string{} -var BUILDIN_ALPINE_MIRRORS = GenerateBuildInList(ALPINE_OFFICAL_MIRRORS, ALPINE_CUSTOM_MIRRORS) +var BUILDIN_ALPINE_MIRRORS = GenerateBuildInList(ALPINE_OFFICIAL_MIRRORS, ALPINE_CUSTOM_MIRRORS) var ALPINE_DEFAULT_CACHE_RULES = []Rule{ {Pattern: regexp.MustCompile(`APKINDEX.tar.gz$`), CacheControl: `max-age=3600`, Rewrite: true, OS: TYPE_LINUX_DISTROS_ALPINE}, diff --git a/internal/define/centos.go b/internal/define/centos.go index c8ff935..9466c12 100644 --- a/internal/define/centos.go +++ b/internal/define/centos.go @@ -8,7 +8,7 @@ const CENTOS_BENCHMAKR_URL = "TIME" // https://www.centos.org/download/mirrors/ 2022.11.19 // Sites that contain protocol headers, restrict access to resources using that protocol -var CENTOS_OFFICAL_MIRRORS = []string{ +var CENTOS_OFFICIAL_MIRRORS = []string{ "mirrors.bfsu.edu.cn/centos/", "mirrors.cqu.edu.cn/CentOS/", "http://mirrors.neusoft.edu.cn/centos/", @@ -27,7 +27,7 @@ var CENTOS_CUSTOM_MIRRORS = []string{ "mirrors.aliyun.com/centos/", } -var BUILDIN_CENTOS_MIRRORS = GenerateBuildInList(CENTOS_OFFICAL_MIRRORS, CENTOS_CUSTOM_MIRRORS) +var BUILDIN_CENTOS_MIRRORS = GenerateBuildInList(CENTOS_OFFICIAL_MIRRORS, CENTOS_CUSTOM_MIRRORS) var CENTOS_DEFAULT_CACHE_RULES = []Rule{ {Pattern: regexp.MustCompile(`repomd.xml$`), CacheControl: `max-age=3600`, Rewrite: true, OS: TYPE_LINUX_DISTROS_CENTOS}, diff --git a/internal/define/debian.go b/internal/define/debian.go index 323919f..286149c 100644 --- a/internal/define/debian.go +++ b/internal/define/debian.go @@ -10,7 +10,7 @@ var DEBIAN_HOST_PATTERN = regexp.MustCompile(`/debian/(.+)$`) // https://www.debian.org/mirror/list 2022.11.19 // Sites that contain protocol headers, restrict access to resources using that protocol -var DEBIAN_OFFICAL_MIRRORS = []string{ +var DEBIAN_OFFICIAL_MIRRORS = []string{ "http://ftp.cn.debian.org/debian/", "mirror.bjtu.edu.cn/debian/", "mirrors.163.com/debian/", @@ -30,7 +30,7 @@ var DEBIAN_CUSTOM_MIRRORS = []string{ "mirror.nju.edu.cn/debian/", } -var BUILDIN_DEBIAN_MIRRORS = GenerateBuildInList(DEBIAN_OFFICAL_MIRRORS, DEBIAN_CUSTOM_MIRRORS) +var BUILDIN_DEBIAN_MIRRORS = GenerateBuildInList(DEBIAN_OFFICIAL_MIRRORS, DEBIAN_CUSTOM_MIRRORS) var DEBIAN_DEFAULT_CACHE_RULES = []Rule{ {Pattern: regexp.MustCompile(`deb$`), CacheControl: `max-age=100000`, Rewrite: true, OS: TYPE_LINUX_DISTROS_DEBIAN}, diff --git a/internal/define/define.go b/internal/define/define.go index b64a4c1..1d4ce99 100644 --- a/internal/define/define.go +++ b/internal/define/define.go @@ -50,9 +50,9 @@ func GenerateAliasFromURL(url string) string { return "cn:" + group[len(group)-1] } -func GenerateBuildInMirorItem(url string, offical bool) UrlWithAlias { +func GenerateBuildInMirorItem(url string, official bool) UrlWithAlias { var mirror UrlWithAlias - mirror.Official = offical + mirror.Official = official mirror.Alias = GenerateAliasFromURL(url) if strings.HasPrefix(url, "http://") { diff --git a/internal/define/define_test.go b/internal/define/define_test.go index a153260..938aab9 100644 --- a/internal/define/define_test.go +++ b/internal/define/define_test.go @@ -48,10 +48,10 @@ func TestGenerateBuildInMirorItem(t *testing.T) { } func TestGenerateBuildInList(t *testing.T) { - mirrors := Define.GenerateBuildInList(Define.UBUNTU_OFFICAL_MIRRORS, Define.UBUNTU_CUSTOM_MIRRORS) + mirrors := Define.GenerateBuildInList(Define.UBUNTU_OFFICIAL_MIRRORS, Define.UBUNTU_CUSTOM_MIRRORS) count := 0 - for _, url := range Define.UBUNTU_OFFICAL_MIRRORS { + for _, url := range Define.UBUNTU_OFFICIAL_MIRRORS { if strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://") { count += 1 } else { diff --git a/internal/define/mirror_test.go b/internal/define/mirror_test.go index abb35b9..98eb869 100644 --- a/internal/define/mirror_test.go +++ b/internal/define/mirror_test.go @@ -1,7 +1,7 @@ package define_test // func TestPrintUbuntuPingScript(t *testing.T) { -// for _, url := range Define.UBUNTU_OFFICAL_MIRRORS { +// for _, url := range Define.UBUNTU_OFFICIAL_MIRRORS { // if !(strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://")) { // fmt.Println(`echo "` + url + `"`) // http := "curl --connect-timeout 2 -I http://" + url + Define.UBUNTU_BENCHMAKR_URL @@ -22,7 +22,7 @@ package define_test // } // func TestPrintDebianPingScript(t *testing.T) { -// for _, url := range Define.DEBIAN_OFFICAL_MIRRORS { +// for _, url := range Define.DEBIAN_OFFICIAL_MIRRORS { // if !(strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://")) { // fmt.Println(`echo "` + url + `"`) // http := "curl --connect-timeout 2 -I http://" + url + Define.DEBIAN_BENCHMAKR_URL @@ -43,7 +43,7 @@ package define_test // } // func TestPrintCentosPingScript(t *testing.T) { -// for _, url := range Define.CENTOS_OFFICAL_MIRRORS { +// for _, url := range Define.CENTOS_OFFICIAL_MIRRORS { // if !(strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://")) { // fmt.Println(`echo "` + url + `"`) // http := "curl --connect-timeout 2 -I http://" + url + Define.CENTOS_BENCHMAKR_URL @@ -64,7 +64,7 @@ package define_test // } // func TestPrintCentosPingScript(t *testing.T) { -// for _, url := range Define.ALPINE_OFFICAL_MIRRORS { +// for _, url := range Define.ALPINE_OFFICIAL_MIRRORS { // if !(strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://")) { // fmt.Println(`echo "` + url + `"`) // http := "curl --connect-timeout 2 -I http://" + url + Define.ALPINE_BENCHMAKR_URL diff --git a/internal/define/ubuntu.go b/internal/define/ubuntu.go index 416732d..53de78c 100644 --- a/internal/define/ubuntu.go +++ b/internal/define/ubuntu.go @@ -13,7 +13,7 @@ var UBUNTU_HOST_PATTERN = regexp.MustCompile(`/ubuntu/(.+)$`) // http://mirrors.ubuntu.com/mirrors.txt 2022.11.19 // Sites that contain protocol headers, restrict access to resources using that protocol -var UBUNTU_OFFICAL_MIRRORS = []string{ +var UBUNTU_OFFICIAL_MIRRORS = []string{ "mirrors.cn99.com/ubuntu/", "mirrors.tuna.tsinghua.edu.cn/ubuntu/", "mirrors.cnnic.cn/ubuntu/", @@ -46,7 +46,7 @@ var UBUNTU_CUSTOM_MIRRORS = []string{ "mirrors.163.com/ubuntu/", } -var BUILDIN_UBUNTU_MIRRORS = GenerateBuildInList(UBUNTU_OFFICAL_MIRRORS, UBUNTU_CUSTOM_MIRRORS) +var BUILDIN_UBUNTU_MIRRORS = GenerateBuildInList(UBUNTU_OFFICIAL_MIRRORS, UBUNTU_CUSTOM_MIRRORS) var UBUNTU_DEFAULT_CACHE_RULES = []Rule{ {Pattern: regexp.MustCompile(`deb$`), CacheControl: `max-age=100000`, Rewrite: true, OS: TYPE_LINUX_DISTROS_UBUNTU},