lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-01 23:16:23 -05:00
Code Issues Releases Wiki Activity

Fix config file path resolution for Windows

Browse Source
This commit is contained in:
V2Ray 2015-09-17 11:24:19 +02:00
parent 26c040537f
commit 2b7fdef203
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
release/server/main.go
View File

@ -3,7 +3,7 @@ package main
import ( import (
"flag" "flag"
"io/ioutil" "io/ioutil"
"path" "path/filepath"
"github.com/v2ray/v2ray-core" "github.com/v2ray/v2ray-core"
"github.com/v2ray/v2ray-core/log" "github.com/v2ray/v2ray-core/log"
@ -45,12 +45,12 @@ func main() {
panic(log.Error("Failed to parse Config: %v", err)) panic(log.Error("Failed to parse Config: %v", err))
} }
if !path.IsAbs(vconfig.InboundConfig.File) && len(vconfig.InboundConfig.File) > 0 { if !filepath.IsAbs(vconfig.InboundConfig.File) && len(vconfig.InboundConfig.File) > 0 {
vconfig.InboundConfig.File = path.Join(path.Dir(*configFile), vconfig.InboundConfig.File) vconfig.InboundConfig.File = filepath.Join(filepath.Dir(*configFile), vconfig.InboundConfig.File)
} }
if !path.IsAbs(vconfig.OutboundConfig.File) && len(vconfig.OutboundConfig.File) > 0 { if !filepath.IsAbs(vconfig.OutboundConfig.File) && len(vconfig.OutboundConfig.File) > 0 {
vconfig.OutboundConfig.File = path.Join(path.Dir(*configFile), vconfig.OutboundConfig.File) vconfig.OutboundConfig.File = filepath.Join(filepath.Dir(*configFile), vconfig.OutboundConfig.File)
} }
vPoint, err := core.NewPoint(vconfig) vPoint, err := core.NewPoint(vconfig)