history-museum/clash
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Feature: can set specify config file path in cli (#360)

Browse Source
This commit is contained in:
Zephyr
2019-10-14 18:11:22 +08:00
committed by Dreamacro
parent f4326daaa4
commit 0a3595414e
2 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
main.go
View File

@ -17,12 +17,14 @@ import (
)
var (
version bool
homedir string
version bool
homeDir string
configFile string
)
func init() {
flag.StringVar(&homedir, "d", "", "set configuration directory")
flag.StringVar(&homeDir, "d", "", "set configuration directory")
flag.StringVar(&configFile, "f", "", "specify configuration file")
flag.BoolVar(&version, "v", false, "show current version of clash")
flag.Parse()
}
@ -33,12 +35,23 @@ func main() {
return
}
if homedir != "" {
if !filepath.IsAbs(homedir) {
if homeDir != "" {
if !filepath.IsAbs(homeDir) {
currentDir, _ := os.Getwd()
homedir = filepath.Join(currentDir, homedir)
homeDir = filepath.Join(currentDir, homeDir)
}
C.SetHomeDir(homedir)
C.SetHomeDir(homeDir)
}
if configFile != "" {
if !filepath.IsAbs(configFile) {
currentDir, _ := os.Getwd()
configFile = filepath.Join(currentDir, configFile)
}
C.SetConfig(configFile)
} else {
configFile := filepath.Join(C.Path.HomeDir(), C.Path.Config())
C.SetConfig(configFile)
}
if err := config.Init(C.Path.HomeDir()); err != nil {