Fix so ui calls tor properly on windows to launch the bundled tor #199
13
main.go
13
main.go
|
@ -193,15 +193,18 @@ func loadACN() {
|
||||||
torpath := "tor"
|
torpath := "tor"
|
||||||
if runtime.GOOS == "android" {
|
if runtime.GOOS == "android" {
|
||||||
torpath = path.Join(androidBaseDir, "lib/libtor.so")
|
torpath = path.Join(androidBaseDir, "lib/libtor.so")
|
||||||
|
} else if runtime.GOOS == "windows" {
|
||||||
|
ex, err := os.Executable()
|
||||||
|
if err != nil {
|
||||||
|
ex = ""
|
||||||
|
}
|
||||||
|
exPath := filepath.Dir(ex)
|
||||||
|
torpath = path.Join(exPath, "tor-0.3.5.7", "Tor", "tor.exe")
|
||||||
} else {
|
} else {
|
||||||
dir, _ := filepath.Abs(filepath.Dir(os.Args[0]))
|
dir, _ := filepath.Abs(filepath.Dir(os.Args[0]))
|
||||||
if _, err := os.Stat(path.Join(dir, "tor")); os.IsNotExist(err) {
|
if _, err := os.Stat(path.Join(dir, "tor")); os.IsNotExist(err) {
|
||||||
if _, err := os.Stat(path.Join(dir, "deploy", "linux", "tor")); os.IsNotExist(err) {
|
if _, err := os.Stat(path.Join(dir, "deploy", "linux", "tor")); os.IsNotExist(err) {
|
||||||
if _, err := os.Stat(path.Join(dir, "deploy", "windows", "tor")); os.IsNotExist(err) {
|
log.Warnln("Cannot find bundled Tor")
|
||||||
log.Warnln("Cannot find bundled Tor")
|
|
||||||
} else {
|
|
||||||
torpath = path.Join(dir, "deploy", "windows", "tor")
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
torpath = path.Join(dir, "deploy", "linux", "tor")
|
torpath = path.Join(dir, "deploy", "linux", "tor")
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue