remove ovh

butlerd/generous/docs/README.md

@@ -155,7 +155,7 @@ installing them.
 
 Use the following HTTP endpoint to check for a newer version:
 
-  * <https://broth.itch.ovh/butler/windows-amd64/LATEST>
+  * <https://broth.itch.zone/butler/windows-amd64/LATEST>
 
 Where `windows-amd64` is one of:
 
@@ -169,7 +169,7 @@ Where `windows-amd64` is one of:
 For example, if the contents of `LATEST` is `11.1.0`, then
 the latest version of butler can be downloaded via:
 
-  * <https://broth.itch.ovh/butler/windows-amd64/11.1.0/butler/.zip>
+  * <https://broth.itch.zone/butler/windows-amd64/11.1.0/butler/.zip>
 
 Make sure when you unzip it, that the executable bit is set on Linux & macOS.
 

butlerd/generous/layout.md

@@ -155,7 +155,7 @@ installing them.
 
 Use the following HTTP endpoint to check for a newer version:
 
-  * <https://broth.itch.ovh/butler/windows-amd64/LATEST>
+  * <https://broth.itch.zone/butler/windows-amd64/LATEST>
 
 Where `windows-amd64` is one of:
 
@@ -169,7 +169,7 @@ Where `windows-amd64` is one of:
 For example, if the contents of `LATEST` is `11.1.0`, then
 the latest version of butler can be downloaded via:
 
-  * <https://broth.itch.ovh/butler/windows-amd64/11.1.0/butler/.zip>
+  * <https://broth.itch.zone/butler/windows-amd64/11.1.0/butler/.zip>
 
 Make sure when you unzip it, that the executable bit is set on Linux & macOS.
 

cmd/diag/diag.go

@@ -121,7 +121,7 @@ func do(mc *mansion.Context) {
 		runTest("CDN reachable", httpTest("https://static.itch.io/ping.txt", 200))
 		runTest("Web reachable", httpTest("https://itch.io/static/ping.txt", 200))
 		runTest("API reachable", httpTest("https://api.itch.io/login", 405))
-		runTest("Broth reachable", httpTest("https://broth.itch.ovh", 200))
+		runTest("Broth reachable", httpTest("https://broth.itch.zone", 200))
 	}
 
 	if params.Glibc {
@@ -169,7 +169,7 @@ func do(mc *mansion.Context) {
 	}
 
 	if params.Speed {
-		testFileURL := "https://broth.itch.ovh/speedtest/100mib/LATEST/archive/default"
+		testFileURL := "https://broth.itch.zone/speedtest/100mib/LATEST/archive/default"
 
 		runTracker := func(contentLength int64, cancel context.CancelFunc, f func(t tracker.Tracker) error) (string, error) {
 			t := tracker.New(tracker.Opts{

cmd/elfprops/elfprops.go

@@ -119,7 +119,7 @@ func do(ctx *mansion.Context) {
 			processLib := func(libName string) {
 				values := make(url.Values)
 				values.Add("file", libName)
-				searchURL := fmt.Sprintf("https://broth.itch.ovh/debsearch/by-file-path/ubuntu/%s/%s?%s", codeword, debarch, values.Encode())
+				searchURL := fmt.Sprintf("https://broth.itch.zone/debsearch/by-file-path/ubuntu/%s/%s?%s", codeword, debarch, values.Encode())
 				log.Printf("Querying broth (%s)...", searchURL)
 
 				res, err := client.Get(searchURL)

cmd/prereqs/handler.go

@@ -139,7 +139,7 @@ func (h *handler) GetRegistry() (*redist.RedistRegistry, error) {
 
 		if needFetch || wantFetch {
 			err := func() error {
-				src, err := eos.Open("https://broth.itch.ovh/itch-redists/info/LATEST/unpacked", option.WithConsumer(h.consumer()))
+				src, err := eos.Open("https://broth.itch.zone/itch-redists/info/LATEST/unpacked", option.WithConsumer(h.consumer()))
 				if err != nil {
 					return errors.Wrap(err, "opening remote registry file")
 				}

cmd/prereqs/test_command.go

@@ -21,7 +21,7 @@ import (
 func Test(ctx *mansion.Context, prereqs []string) error {
 	comm.Opf("Fetching registry...")
 
-	baseURL := "https://broth.itch.ovh/itch-redists"
+	baseURL := "https://broth.itch.zone/itch-redists"
 
 	infoURL := fmt.Sprintf("%s/info/LATEST/unpacked/default", baseURL)
 	res, err := http.Get(infoURL)

cmd/validate/validate.go

@@ -263,7 +263,7 @@ func Validate(consumer *state.Consumer) error {
 		consumer.Statf("Validating %d prereqs...", len(appManifest.Prereqs))
 		consumer.Infof("")
 
-		regFile, err := eos.Open("https://broth.itch.ovh/itch-redists/info/LATEST/unpacked", option.WithConsumer(consumer))
+		regFile, err := eos.Open("https://broth.itch.zone/itch-redists/info/LATEST/unpacked", option.WithConsumer(consumer))
 		if err != nil {
 			return errors.Wrap(err, "opening prereqs registry")
 		}

docs/installing.md

@@ -13,7 +13,7 @@ Better yet, you can install it using the [itch app](https://itch.io/app), so it
 
 You can download the latest, bleeding-edge version of butler from broth:
 
-  - <https://broth.itch.ovh/butler>
+  - <https://broth.itch.zone/butler>
 
 broth is the download server used by the desktop app to install its own copy of butler.
 
@@ -23,7 +23,7 @@ This is recommended if you need to install butler as part of a script, perhaps f
 
 If you want to get the latest stable, for example, you could curl or wget the following URL:
 
-  - <https://broth.itch.ovh/butler/linux-amd64/LATEST/archive/default>
+  - <https://broth.itch.zone/butler/linux-amd64/LATEST/archive/default>
 
 You can substitute `linux-amd64` with any channel listed on broth.
 
@@ -33,7 +33,7 @@ an example bash script to install the latest stable butler for Linux:
 ```
 # -L follows redirects
 # -O specifies output name
-curl -L -o butler.zip https://broth.itch.ovh/butler/linux-amd64/LATEST/archive/default
+curl -L -o butler.zip https://broth.itch.zone/butler/linux-amd64/LATEST/archive/default
 unzip butler.zip
 # GNU unzip tends to not set the executable bit even though it's set in the .zip
 chmod +x butler
@@ -138,20 +138,3 @@ about PowerShell you probably didn't need to read most of this page anyway.*
 If you ever forget where you put your butler.exe, the `butler which` command
 will print its complete path.
 
-## Appendix: What happened to dl.itch.ovh ?
-
-If you followed these instructions before September 2018, you might have
-download URLs starting with `dl.itch.ovh`. While new versions of butler are
-still being deployed to that server for the time being, it is deprecated
-and new CI setups should use the latest `broth.itch.ovh` URLs instead.
-
-`dl.itch.ovh` was a simple storage bucket with a proxy in front. It did
-the job, but some users were unable to access it, and download speeds were
-sometimes suboptimal for non-US users. `broth.itch.ovh` serves downloads
-through itch.io's CDN, which means every should have access and reasonable
-download speeds.
-
-Additionally, `dl.itch.ovh` served "naked binaries", whereas `broth.itch.ovh`
-now serves .zip archives, because the full butler distribution is more than
-one file. See the install instructions above for what these files are, and
-example bash code on how to install butler from broth.

mansion/versioncheck.go

@@ -17,7 +17,7 @@ func (ctx *Context) UpdateBaseURL(variant VersionVariant) string {
 	if variant == VersionVariantHead {
 		channel += "-head"
 	}
-	return fmt.Sprintf("https://broth.itch.ovh/butler/%s", channel)
+	return fmt.Sprintf("https://broth.itch.zone/butler/%s", channel)
 }
 
 func (ctx *Context) DoVersionCheck() {

release/deploy.js

@@ -36,7 +36,7 @@ async function main(_args) {
   mkdirSync(toolsDir, { recursive: true });
   await cd(toolsDir, async () => {
     let ref = `65bf13509d214308111a7b9c0f227099034536c7`;
-    let url = `https://broth.itch.ovh/butler/linux-amd64-head/${ref}/.zip`;
+    let url = `https://broth.itch.zone/butler/linux-amd64-head/${ref}/.zip`;
     $(`curl -sLo butler.zip "${url}"`);
     $(`unzip butler.zip`);
   });

shell/runself.go

@@ -174,7 +174,7 @@ func fetchWindowsButler(params RunSelfParams, info *launchInfo) error {
 
 	installFolder := filepath.Join(params.PrereqsDir, osarch, "butler", version)
 	consumer.Debugf("Will install to: (%s)", installFolder)
-	url := fmt.Sprintf("https://broth.itch.ovh/butler/%s/%s/archive/default", channel, version)
+	url := fmt.Sprintf("https://broth.itch.zone/butler/%s/%s/archive/default", channel, version)
 
 	f, err := eos.Open(url, option.WithConsumer(consumer))
 	if err != nil {