From b79dd188d916da7adbf448dc27b0c59a04e0938d Mon Sep 17 00:00:00 2001
From: Bas van Kervel <basvankervel@ziggo.nl>
Date: Tue, 12 May 2015 14:24:11 +0200
Subject: replaced several path.* with filepath.* which is platform independent

---
 cmd/geth/js.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'cmd/geth/js.go')

diff --git a/cmd/geth/js.go b/cmd/geth/js.go
index 9b0ab0a1b..d7c76d85c 100644
--- a/cmd/geth/js.go
+++ b/cmd/geth/js.go
@@ -22,9 +22,10 @@ import (
 	"fmt"
 	"math/big"
 	"os"
-	"path"
 	"strings"
 
+	"path/filepath"
+
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/common/docserver"
 	"github.com/ethereum/go-ethereum/common/natspec"
@@ -209,7 +210,7 @@ func (self *jsre) interactive() {
 }
 
 func (self *jsre) withHistory(op func(*os.File)) {
-	hist, err := os.OpenFile(path.Join(self.ethereum.DataDir, "history"), os.O_RDWR|os.O_CREATE, os.ModePerm)
+	hist, err := os.OpenFile(filepath.Join(self.ethereum.DataDir, "history"), os.O_RDWR|os.O_CREATE, os.ModePerm)
 	if err != nil {
 		fmt.Printf("unable to open history file: %v\n", err)
 		return
-- 
cgit v1.2.3


From 95773b9673ac78fdceb152d1dd2528f90e8a02b7 Mon Sep 17 00:00:00 2001
From: Bas van Kervel <basvankervel@ziggo.nl>
Date: Tue, 12 May 2015 15:20:53 +0200
Subject: removed redundant newlines in import block

---
 cmd/geth/js.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'cmd/geth/js.go')

diff --git a/cmd/geth/js.go b/cmd/geth/js.go
index d7c76d85c..61e97433a 100644
--- a/cmd/geth/js.go
+++ b/cmd/geth/js.go
@@ -22,9 +22,8 @@ import (
 	"fmt"
 	"math/big"
 	"os"
-	"strings"
-
 	"path/filepath"
+	"strings"
 
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/common/docserver"
-- 
cgit v1.2.3


From da9fe951da4005761a014316c46771d628dc058e Mon Sep 17 00:00:00 2001
From: Gustav Simonsson <gustav.simonsson@gmail.com>
Date: Thu, 2 Apr 2015 21:14:25 +0200
Subject: Use common.Address type for accounts.Address

---
 cmd/geth/js.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'cmd/geth/js.go')

diff --git a/cmd/geth/js.go b/cmd/geth/js.go
index 61e97433a..4ddb3bd9c 100644
--- a/cmd/geth/js.go
+++ b/cmd/geth/js.go
@@ -26,6 +26,7 @@ import (
 	"strings"
 
 	"github.com/ethereum/go-ethereum/cmd/utils"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/docserver"
 	"github.com/ethereum/go-ethereum/common/natspec"
 	"github.com/ethereum/go-ethereum/eth"
@@ -164,7 +165,7 @@ func (self *jsre) UnlockAccount(addr []byte) bool {
 		return false
 	}
 	// TODO: allow retry
-	if err := self.ethereum.AccountManager().Unlock(addr, pass); err != nil {
+	if err := self.ethereum.AccountManager().Unlock(common.BytesToAddress(addr), pass); err != nil {
 		return false
 	} else {
 		fmt.Println("Account is now unlocked for this session.")
-- 
cgit v1.2.3