Windows file path

drivers/azure/azure.go

@@ -5,7 +5,7 @@ import (
 	"net"
 	"os"
 	"os/exec"
-	"path"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
@@ -562,13 +562,13 @@ func (driver *Driver) generateCertForAzure() error {
 }
 
 func (driver *Driver) sshKeyPath() string {
-	return path.Join(driver.storePath, "id_rsa")
+	return filepath.Join(driver.storePath, "id_rsa")
 }
 
 func (driver *Driver) publicSSHKeyPath() string {
 	return driver.sshKeyPath() + ".pub"
 }
 
 func (driver *Driver) azureCertPath() string {
-	return path.Join(driver.storePath, "azure_cert.pem")
+	return filepath.Join(driver.storePath, "azure_cert.pem")
 }

drivers/digitalocean/digitalocean.go

@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
-	"path"
+	"path/filepath"
 	"time"
 
 	"code.google.com/p/goauth2/oauth"
@@ -323,7 +323,7 @@ func (d *Driver) getClient() *godo.Client {
 }
 
 func (d *Driver) sshKeyPath() string {
-	return path.Join(d.storePath, "id_rsa")
+	return filepath.Join(d.storePath, "id_rsa")
 }
 
 func (d *Driver) publicSSHKeyPath() string {

drivers/utils.go

@@ -4,16 +4,18 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-
-	homedir "github.com/mitchellh/go-homedir"
+	"runtime"
 )
 
-func PublicKeyPath() string {
-	homeDir, err := homedir.Dir()
-	if err != nil {
-		homeDir = ""
+func GetHomeDir() string {
+	if runtime.GOOS == "windows" {
+		return os.Getenv("USERPROFILE")
 	}
-	return filepath.Join(homeDir, ".docker/public-key.json")
+	return os.Getenv("HOME")
+}
+
+func PublicKeyPath() string {
+	return filepath.Join(GetHomeDir(), ".docker", "public-key.json")
 }
 
 func AddPublicKeyToAuthorizedHosts(d Driver, authorizedKeysPath string) error {

drivers/virtualbox/virtualbox.go

@@ -11,7 +11,7 @@ import (
 	"net/http"
 	"os"
 	"os/exec"
-	"path"
+	"path/filepath"
 	"regexp"
 	"runtime"
 	"strconv"
@@ -209,7 +209,7 @@ func (d *Driver) Create() error {
 		"--port", "0",
 		"--device", "0",
 		"--type", "dvddrive",
-		"--medium", path.Join(d.storePath, "boot2docker.iso")); err != nil {
+		"--medium", filepath.Join(d.storePath, "boot2docker.iso")); err != nil {
 		return err
 	}
 
@@ -434,15 +434,15 @@ func (d *Driver) GetSSHCommand(args ...string) (*exec.Cmd, error) {
 }
 
 func (d *Driver) sshKeyPath() string {
-	return path.Join(d.storePath, "id_rsa")
+	return filepath.Join(d.storePath, "id_rsa")
 }
 
 func (d *Driver) publicSSHKeyPath() string {
 	return d.sshKeyPath() + ".pub"
 }
 
 func (d *Driver) diskPath() string {
-	return path.Join(d.storePath, "disk.vmdk")
+	return filepath.Join(d.storePath, "disk.vmdk")
 }
 
 // Get the latest boot2docker release tag name (e.g. "v0.6.0").
@@ -490,7 +490,7 @@ func downloadISO(dir, file, url string) error {
 	if err := f.Close(); err != nil {
 		return err
 	}
-	if err := os.Rename(f.Name(), path.Join(dir, file)); err != nil {
+	if err := os.Rename(f.Name(), filepath.Join(dir, file)); err != nil {
 		return err
 	}
 	return nil

host.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"path"
+	"path/filepath"
 	"regexp"
 
 	log "github.com/Sirupsen/logrus"
@@ -105,7 +105,7 @@ func (h *Host) GetURL() (string, error) {
 }
 
 func (h *Host) LoadConfig() error {
-	data, err := ioutil.ReadFile(path.Join(h.storePath, "config.json"))
+	data, err := ioutil.ReadFile(filepath.Join(h.storePath, "config.json"))
 	if err != nil {
 		return err
 	}
@@ -135,7 +135,7 @@ func (h *Host) SaveConfig() error {
 	if err != nil {
 		return err
 	}
-	if err := ioutil.WriteFile(path.Join(h.storePath, "config.json"), data, 0600); err != nil {
+	if err := ioutil.WriteFile(filepath.Join(h.storePath, "config.json"), data, 0600); err != nil {
 		return err
 	}
 	return nil