Merge pull request #933 from bas-vk/issue928

replaced path with platform aware filepath module

3 files changed, 7 insertions, 8 deletions

diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go
index 66614478c..53194ae50 100644
--- a/cmd/mist/gui.go
+++ b/cmd/mist/gui.go
@@ -27,7 +27,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"math/big"
-	"path"
+	"path/filepath"
 	"runtime"
 	"sort"
 	"time"
@@ -79,7 +79,7 @@ type Gui struct {
 
 // Create GUI, but doesn't start it
 func NewWindow(ethereum *eth.Ethereum) *Gui {
-	db, err := ethdb.NewLDBDatabase(path.Join(ethereum.DataDir, "tx_database"))
+	db, err := ethdb.NewLDBDatabase(filepath.Join(ethereum.DataDir, "tx_database"))
 	if err != nil {
 		panic(err)
 	}
@@ -92,7 +92,7 @@ func NewWindow(ethereum *eth.Ethereum) *Gui {
 		plugins:       make(map[string]plugin),
 		serviceEvents: make(chan ServEv, 1),
 	}
-	data, _ := ioutil.ReadFile(path.Join(ethereum.DataDir, "plugins.json"))
+	data, _ := ioutil.ReadFile(filepath.Join(ethereum.DataDir, "plugins.json"))
 	json.Unmarshal(data, &gui.plugins)
 
 	return gui
diff --git a/cmd/mist/html_container.go b/cmd/mist/html_container.go
index 7c948885a..c9b1f1cd6 100644
--- a/cmd/mist/html_container.go
+++ b/cmd/mist/html_container.go
@@ -26,7 +26,6 @@ import (
 	"io/ioutil"
 	"net/url"
 	"os"
-	"path"
 	"path/filepath"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -80,7 +79,7 @@ func (app *HtmlApplication) RootFolder() string {
 	if err != nil {
 		return ""
 	}
-	return path.Dir(common.WindonizePath(folder.RequestURI()))
+	return filepath.Dir(common.WindonizePath(folder.RequestURI()))
 }
 func (app *HtmlApplication) RecursiveFolders() []os.FileInfo {
 	files, _ := ioutil.ReadDir(app.RootFolder())
diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go
index 0958294c3..0618c5e92 100644
--- a/cmd/mist/ui_lib.go
+++ b/cmd/mist/ui_lib.go
@@ -22,7 +22,7 @@ package main
 
 import (
 	"io/ioutil"
-	"path"
+	"path/filepath"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -110,7 +110,7 @@ func (ui *UiLib) ConnectToPeer(nodeURL string) {
 }
 
 func (ui *UiLib) AssetPath(p string) string {
-	return path.Join(ui.assetPath, p)
+	return filepath.Join(ui.assetPath, p)
 }
 
 func (self *UiLib) Transact(params map[string]interface{}) (string, error) {
@@ -218,7 +218,7 @@ func (self *UiLib) Messages(id int) *common.List {
 }
 
 func (self *UiLib) ReadFile(p string) string {
-	content, err := ioutil.ReadFile(self.AssetPath(path.Join("ext", p)))
+	content, err := ioutil.ReadFile(self.AssetPath(filepath.Join("ext", p)))
 	if err != nil {
 		guilogger.Infoln("error reading file", p, ":", err)
 	}