From 8eeab7ea3fb7a01a610e46940141eecf7435873a Mon Sep 17 00:00:00 2001
From: Taylor Gerring <taylor.gerring@gmail.com>
Date: Thu, 26 Feb 2015 02:24:20 +0100
Subject: Update osext import path

---
 cmd/mist/flags.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmd/mist')

diff --git a/cmd/mist/flags.go b/cmd/mist/flags.go
index d5ed60a21..c4edb8dae 100644
--- a/cmd/mist/flags.go
+++ b/cmd/mist/flags.go
@@ -30,12 +30,12 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"bitbucket.org/kardianos/osext"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethutil"
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/p2p/nat"
 	"github.com/ethereum/go-ethereum/vm"
+	"github.com/kardianos/osext"
 )
 
 var (
-- 
cgit v1.2.3


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()

---
 cmd/mist/flags.go | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

(limited to 'cmd/mist')

diff --git a/cmd/mist/flags.go b/cmd/mist/flags.go
index c4edb8dae..8dab59d80 100644
--- a/cmd/mist/flags.go
+++ b/cmd/mist/flags.go
@@ -68,33 +68,6 @@ var (
 
 // flags specific to gui client
 var AssetPath string
-
-//TODO: If we re-use the one defined in cmd.go the binary osx image crashes. If somebody finds out why we can dry this up.
-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
-}
-
 var defaultConfigFile = path.Join(ethutil.DefaultDataDir(), "conf.ini")
 
 func Init() {
@@ -122,7 +95,7 @@ func Init() {
 	flag.StringVar(&DebugFile, "debug", "", "debug file (no debugging if not set)")
 	flag.IntVar(&LogLevel, "loglevel", int(logger.InfoLevel), "loglevel: 0-5: silent,error,warn,info,debug,debug detail)")
 
-	flag.StringVar(&AssetPath, "asset_path", defaultAssetPath(), "absolute path to GUI assets directory")
+	flag.StringVar(&AssetPath, "asset_path", ethutil.DefaultAssetPath(), "absolute path to GUI assets directory")
 
 	// Network stuff
 	var (
-- 
cgit v1.2.3


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

---
 cmd/mist/flags.go | 2 --
 1 file changed, 2 deletions(-)

(limited to 'cmd/mist')

diff --git a/cmd/mist/flags.go b/cmd/mist/flags.go
index 8dab59d80..0010df826 100644
--- a/cmd/mist/flags.go
+++ b/cmd/mist/flags.go
@@ -27,7 +27,6 @@ import (
 	"log"
 	"os"
 	"path"
-	"path/filepath"
 	"runtime"
 
 	"github.com/ethereum/go-ethereum/crypto"
@@ -35,7 +34,6 @@ import (
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/p2p/nat"
 	"github.com/ethereum/go-ethereum/vm"
-	"github.com/kardianos/osext"
 )
 
 var (
-- 
cgit v1.2.3