From d5aed82b11589bb3f8b0df4544081fe898b8c724 Mon Sep 17 00:00:00 2001
From: Taylor Gerring <taylor.gerring@gmail.com>
Date: Thu, 26 Feb 2015 02:32:27 +0100
Subject: DRY DefaultAssetPath()

---
 ethutil/common.go | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'ethutil/common.go')

diff --git a/ethutil/common.go b/ethutil/common.go
index efc519732..d439dcedc 100644
--- a/ethutil/common.go
+++ b/ethutil/common.go
@@ -2,6 +2,7 @@ package ethutil
 
 import (
 	"fmt"
+	"github.com/kardianos/osext"
 	"math/big"
 	"os/user"
 	"path"
@@ -9,6 +10,31 @@ import (
 	"time"
 )
 
+func DefaultAssetPath() string {
+	var assetPath string
+	// If the current working directory is the go-ethereum dir
+	// assume a debug build and use the source directory as
+	// asset directory.
+	pwd, _ := os.Getwd()
+	if pwd == path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "cmd", "mist") {
+		assetPath = path.Join(pwd, "assets")
+	} else {
+		switch runtime.GOOS {
+		case "darwin":
+			// Get Binary Directory
+			exedir, _ := osext.ExecutableFolder()
+			assetPath = filepath.Join(exedir, "../Resources")
+		case "linux":
+			assetPath = "/usr/share/mist"
+		case "windows":
+			assetPath = "./assets"
+		default:
+			assetPath = "."
+		}
+	}
+	return assetPath
+}
+
 func DefaultDataDir() string {
 	usr, _ := user.Current()
 	if runtime.GOOS == "darwin" {
-- 
cgit 


From 739b7cc2ac7de9c6c24547be00de81338089d724 Mon Sep 17 00:00:00 2001
From: Taylor Gerring <taylor.gerring@gmail.com>
Date: Thu, 26 Feb 2015 02:36:06 +0100
Subject: Cleanup imports

---
 ethutil/common.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'ethutil/common.go')

diff --git a/ethutil/common.go b/ethutil/common.go
index d439dcedc..c4e7415dc 100644
--- a/ethutil/common.go
+++ b/ethutil/common.go
@@ -2,12 +2,15 @@ package ethutil
 
 import (
 	"fmt"
-	"github.com/kardianos/osext"
 	"math/big"
+	"os"
 	"os/user"
 	"path"
+	"path/filepath"
 	"runtime"
 	"time"
+
+	"github.com/kardianos/osext"
 )
 
 func DefaultAssetPath() string {
-- 
cgit