From 1fcf60a8826d938f6f58cc52c1d5662eb2681031 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Tue, 7 Mar 2017 15:10:28 -0600 Subject: [PATCH] Final sweep moving getcarina -> howtowhale --- Makefile | 2 +- README.md | 2 +- dvm-helper/dvm-helper.go | 7 +++---- install.ps1 | 8 ++++---- install.sh | 6 +++--- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index df7603a9..91a40e4d 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ COMMIT = $(shell git rev-parse --verify --short HEAD) VERSION = $(shell git describe --tags --dirty='-dev' 2> /dev/null) PERMALINK = $(shell if [[ $(VERSION) =~ [^-]*-([^.]+).* ]]; then echo $${BASH_REMATCH[1]}; else echo "latest"; fi) -GITHUB_ORG = getcarina +GITHUB_ORG = howtowhale GITHUB_REPO = dvm PACKAGE = github.com/${GITHUB_ORG}/${GITHUB_REPO}/dvm-helper UPGRADE_DISABLED = false diff --git a/README.md b/README.md index e18c04ce..f5e06473 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Docker Version Manager -[![Build Status](https://travis-ci.org/getcarina/dvm.svg?branch=master)](https://travis-ci.org/getcarina/dvm) +[![Build Status](https://travis-ci.org/howtowhale/dvm.svg?branch=master)](https://travis-ci.org/howtowhale/dvm)

howtowhale.github.io/dvm/

diff --git a/dvm-helper/dvm-helper.go b/dvm-helper/dvm-helper.go index d0daf904..a8fccdb9 100644 --- a/dvm-helper/dvm-helper.go +++ b/dvm-helper/dvm-helper.go @@ -1,6 +1,7 @@ package main import ( + "context" "errors" "fmt" "io/ioutil" @@ -12,8 +13,6 @@ import ( "regexp" "strings" - "context" - "github.com/blang/semver" "github.com/codegangsta/cli" dockerclient "github.com/docker/docker/client" @@ -317,7 +316,7 @@ func upgrade(checkOnly bool, version string) { } func buildDvmReleaseURL(version string, elem ...string) string { - prefix := url.Join("https://download.getcarina.com/dvm", version) + prefix := url.Join("https://howtowhale.github.io/dvm/downloads", version) suffix := url.Join(elem...) return url.Join(prefix, suffix) } @@ -797,7 +796,7 @@ func getAvailableVersions(pattern string) []dockerversion.Version { func isUpgradeAvailable() (bool, string) { gh := buildGithubClient() - release, response, err := gh.Repositories.GetLatestRelease("getcarina", "dvm") + release, response, err := gh.Repositories.GetLatestRelease("howtowhale", "dvm") if err != nil { warnWhenRateLimitExceeded(err, response) writeWarning("Unable to query the latest dvm release from GitHub:") diff --git a/install.ps1 b/install.ps1 index bac82b5b..121a12ec 100644 --- a/install.ps1 +++ b/install.ps1 @@ -4,10 +4,10 @@ function downloadDvm([string] $dvmDir) { $webClient = New-Object net.webclient echo "Downloading dvm.ps1..." - $webClient.DownloadFile("https://download.getcarina.com/dvm/latest/dvm.ps1", "$dvmDir\dvm.ps1") + $webClient.DownloadFile("https://howtowhale.github.io/dvm/downloads/latest/dvm.ps1", "$dvmDir\dvm.ps1") echo "Downloading dvm.cmd..." - $webClient.DownloadFile("https://download.getcarina.com/dvm/latest/dvm.cmd", "$dvmDir\dvm.cmd") + $webClient.DownloadFile("https://howtowhale.github.io/dvm/downloads/latest/dvm.cmd", "$dvmDir\dvm.cmd") echo "Downloading dvm-helper.exe..." $tmpDir = Join-Path $dvmDir .tmp @@ -26,8 +26,8 @@ function downloadDvm([string] $dvmDir) { if( [System.Environment]::Is64BitOperatingSystem ) { $arch = "x86_64" } else { $arch = "i686"} # Download latest release - $webClient.DownloadFile("https://download.getcarina.com/dvm/latest/Windows/$arch/dvm-helper.exe", "$tmpDir\dvm-helper.exe") - $webClient.DownloadFile("https://download.getcarina.com/dvm/latest/Windows/$arch/dvm-helper.exe.sha256", "$tmpDir\dvm-helper.exe.256") + $webClient.DownloadFile("https://howtowhale.github.io/dvm/downloads/latest/Windows/$arch/dvm-helper.exe", "$tmpDir\dvm-helper.exe") + $webClient.DownloadFile("https://howtowhale.github.io/dvm/downloads/Windows/$arch/dvm-helper.exe.sha256", "$tmpDir\dvm-helper.exe.256") # Verify the binary was downloaded successfully $checksum = (cat $tmpDir\dvm-helper.exe.256).Split(' ')[0] diff --git a/install.sh b/install.sh index c84ab0c4..e40a71d1 100644 --- a/install.sh +++ b/install.sh @@ -55,7 +55,7 @@ install_dvm_helper() { # Download latest release mkdir -p "$DVM_DIR/dvm-helper" bin="$DVM_DIR/dvm-helper/dvm-helper" - url=https://download.getcarina.com/dvm/latest/$DVM_OS/$DVM_ARCH/dvm-helper + url=https://howtowhale.github.io/dvm/downloads/latest/$DVM_OS/$DVM_ARCH/dvm-helper dvm_download -L --progress-bar $url -o "$bin" chmod u+x $bin } @@ -70,10 +70,10 @@ if [ ! -d "$DVM_DIR" ]; then fi echo "Downloading dvm.sh..." -dvm_download -L --progress-bar https://download.getcarina.com/dvm/latest/dvm.sh -o $DVM_DIR/dvm.sh +dvm_download -L --progress-bar https://howtowhale.github.io/dvm/downloads/latest/dvm.sh -o $DVM_DIR/dvm.sh echo "Downloading bash_completion" -dvm_download -L --progress-bar https://download.getcarina.com/dvm/latest/bash_completion -o $DVM_DIR/bash_completion +dvm_download -L --progress-bar https://howtowhale.github.io/dvm/downloads/latest/bash_completion -o $DVM_DIR/bash_completion echo "Downloading dvm-helper..." install_dvm_helper