Fixed OS compatibility

OperatorFoundation · May 14, 2020 · 0d1e402 · 0d1e402
1 parent 1b657ec
commit 0d1e402
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/transports/Optimizer/v2/Optimizer_test.go b/transports/Optimizer/v2/Optimizer_test.go
@@ -12,6 +12,7 @@ import (
 	"os"
 	"os/user"
 	"path"
+	"runtime"
 	"strings"
 	"testing"
 )
@@ -265,7 +266,12 @@ func getObfs4CertString() (*string, error) {
 		return nil, userError
 	}
 	home := usr.HomeDir
-	fPath := path.Join(home, "shapeshifter-transports/stateDir", "obfs4_bridgeline.txt")
+	var fPath string
+	if runtime.GOOS == "Linux" {
+		fPath = path.Join(home, "gopath/src/github.com/OperatorFoundation/shapeshifter-transports/stateDir/obfs4_bridgeline.txt")
+	} else {
+		fPath = path.Join(home, "shapeshifter-transports/stateDir/obfs4_bridgeline.txt")
+	}
 	bytes, fileError := ioutil.ReadFile(fPath)
 	if fileError != nil {
 		return nil, fileError

diff --git a/transports/Optimizer/v2/go.mod b/transports/Optimizer/v2/go.mod
@@ -3,9 +3,9 @@ module github.com/OperatorFoundation/shapeshifter-transports/transports/Optimize
 go 1.12
 
 require (
-	github.com/OperatorFoundation/shapeshifter-transports/transports/meeklite/v2 v2.1.19
-	github.com/OperatorFoundation/shapeshifter-transports/transports/obfs2/v2 v2.1.19
-	github.com/OperatorFoundation/shapeshifter-transports/transports/obfs4/v2 v2.1.19
-	github.com/OperatorFoundation/shapeshifter-transports/transports/shadow/v2 v2.1.19
+	github.com/OperatorFoundation/shapeshifter-transports/transports/meeklite/v2 v2.1.20
+	github.com/OperatorFoundation/shapeshifter-transports/transports/obfs2/v2 v2.1.20
+	github.com/OperatorFoundation/shapeshifter-transports/transports/obfs4/v2 v2.1.20
+	github.com/OperatorFoundation/shapeshifter-transports/transports/shadow/v2 v2.1.20
 	golang.org/x/net v0.0.0-20200226121028-0de0cce0169b
 )
diff --git a/transports/obfs4/v2/test_utils.go b/transports/obfs4/v2/test_utils.go
@@ -5,6 +5,7 @@ import (
 	"os"
 	"os/user"
 	"path"
+	"runtime"
 	"strings"
 )
 
@@ -16,7 +17,12 @@ func RunLocalObfs4Server(data string) bool {
 		return false
 	}
 	home := usr.HomeDir
-	fPath := path.Join(home, "shapeshifter-transports/stateDir")
+	var fPath string
+	if runtime.GOOS == "Linux" {
+		fPath = path.Join(home, "gopath/src/github.com/OperatorFoundation/shapeshifter-transports/stateDir")
+	} else {
+		fPath = path.Join(home, "shapeshifter-transports/stateDir")
+	}
 	directoryErr := os.Mkdir(fPath, 0775)
 	if directoryErr != nil {
 		if !os.IsExist(directoryErr){
@@ -69,7 +75,12 @@ func RunObfs4Client() (*Transport, error) {
 		return nil, userError
 	}
 	home := usr.HomeDir
-	fPath := path.Join(home, "shapeshifter-transports/stateDir", "obfs4_bridgeline.txt")
+	var fPath string
+	if runtime.GOOS == "Linux" {
+		fPath = path.Join(home, "gopath/src/github.com/OperatorFoundation/shapeshifter-transports/stateDir/obfs4_bridgeline.txt")
+	} else {
+		fPath = path.Join(home, "shapeshifter-transports/stateDir/obfs4_bridgeline.txt")
+	}
 	bytes, fileError := ioutil.ReadFile(fPath)
 	if fileError != nil {
 		return nil, fileError