Skip to content

Commit

Permalink
Final sweep moving getcarina -> howtowhale
Browse files Browse the repository at this point in the history
  • Loading branch information
carolynvs committed Mar 7, 2017
1 parent 8a7f201 commit 1fcf60a
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion 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)

<p style="text-align: center"><a href="https://howtowhale.github.io/dvm/">howtowhale.github.io/dvm/</a></p>

Expand Down
7 changes: 3 additions & 4 deletions dvm-helper/dvm-helper.go
@@ -1,6 +1,7 @@
package main

import (
"context"
"errors"
"fmt"
"io/ioutil"
Expand All @@ -12,8 +13,6 @@ import (
"regexp"
"strings"

"context"

"github.com/blang/semver"
"github.com/codegangsta/cli"
dockerclient "github.com/docker/docker/client"
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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:")
Expand Down
8 changes: 4 additions & 4 deletions install.ps1
Expand Up @@ -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
Expand All @@ -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]
Expand Down
6 changes: 3 additions & 3 deletions install.sh
Expand Up @@ -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
}
Expand All @@ -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
Expand Down

0 comments on commit 1fcf60a

Please sign in to comment.