Clean up messy uname etc. with switches

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Author: nathanleclaire

cmds.go

@@ -309,13 +309,29 @@ func cmdUpgrade() error {
 }
 
 func upgradeBoot2DockerBinary() error {
+	var (
+		goos, arch string
+	)
 	latestVersion, err := getLatestReleaseName("https://api.github.com/repos/boot2docker/boot2docker-cli/releases")
 	if err != nil {
 		return fmt.Errorf("Error attempting to get the latest boot2docker-cli release: %s", err)
 	}
 	baseUrl := "https://github.com/boot2docker/boot2docker-cli/releases/download"
-	goos := "darwin"
-	arch := "amd64"
+
+	switch runtime.GOARCH {
+	case "amd64":
+		arch = "amd64"
+	}
+
+	switch runtime.GOOS {
+	case "darwin", "linux":
+		goos = runtime.GOOS
+	case "windows":
+		goos = "windows"
+
+		// hack
+		arch = "windows.exe"
+	}
 	binaryUrl := fmt.Sprintf("%s/%s/boot2docker-%s-%s-%s", baseUrl, latestVersion, latestVersion, goos, arch)
 	currentBoot2DockerVersion := Version
 	if err := attemptUpgrade(binaryUrl, "boot2docker", latestVersion, currentBoot2DockerVersion); err != nil {
@@ -342,16 +358,20 @@ func upgradeDockerClientBinary() error {
 	if err != nil {
 		return fmt.Errorf("Error getting local Docker client version: %s", err)
 	}
-	clientOsOutput, err := exec.Command("uname", "-s").Output()
-	if err != nil {
-		return fmt.Errorf("Error executing `uname -s` to find Docker client OS: %s", err)
+	switch runtime.GOARCH {
+	case "amd64":
+		clientArch = "x86_64"
+	// todo: wishful thinking?
+	case "arm":
+		clientArch = "armv7l"
 	}
-	clientArchOutput, err := exec.Command("uname", "-m").Output()
-	if err != nil {
-		return fmt.Errorf("Error executing `uname -m` to find Docker client arch: %s", err)
+
+	switch runtime.GOOS {
+	case "darwin":
+		clientOs = "Darwin"
+	case "linux":
+		clientOs = "Linux"
 	}
-	clientOs = strings.TrimSpace(string(clientOsOutput))
-	clientArch = strings.TrimSpace(string(clientArchOutput))
 	binaryUrl := fmt.Sprintf("https://get.docker.com/builds/%s/%s/docker-latest", clientOs, clientArch)
 	if err := attemptUpgrade(binaryUrl, "docker", latestVersion, localClientVersion); err != nil {
 		return fmt.Errorf("Error attempting upgrade: %s", err)