|
|
@@ -13,12 +13,12 @@ func copyConfigFile(src, dest string, goOS GoOS, format bool) error {
|
|
|
return err
|
|
|
}
|
|
|
if format {
|
|
|
- str := string(content)
|
|
|
- str = strings.Replace(str, "\r\n", "\n", -1)
|
|
|
- if goOS == Windows {
|
|
|
- str = strings.Replace(str, "\n", "\r\n", -1)
|
|
|
- }
|
|
|
- content = []byte(str)
|
|
|
+ str := string(content)
|
|
|
+ str = strings.Replace(str, "\r\n", "\n", -1)
|
|
|
+ if goOS == Windows {
|
|
|
+ str = strings.Replace(str, "\n", "\r\n", -1)
|
|
|
+ }
|
|
|
+ content = []byte(str)
|
|
|
}
|
|
|
return ioutil.WriteFile(dest, content, 0777)
|
|
|
}
|
|
|
@@ -43,19 +43,19 @@ func copyConfigFiles(dir string, goOS GoOS) error {
|
|
|
dest = filepath.Join(dir, "vpoint_vmess_freedom.json")
|
|
|
|
|
|
if err := copyConfigFile(src, dest, goOS, true); err != nil {
|
|
|
- return err
|
|
|
+ return err
|
|
|
+ }
|
|
|
+
|
|
|
+ if goOS == Linux {
|
|
|
+ if err := os.MkdirAll(filepath.Join(dir, "systemv"), os.ModeDir|0777); err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
+ src = filepath.Join(srcDir, "systemv", "v2ray")
|
|
|
+ dest = filepath.Join(dir, "systemv", "v2ray")
|
|
|
+ if err := copyConfigFile(src, dest, goOS, false); err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- if goOS == Linux {
|
|
|
- if err := os.MkdirAll(filepath.Join(dir, "systemv"), os.ModeDir|0777); err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
- src = filepath.Join(srcDir, "systemv", "v2ray")
|
|
|
- dest = filepath.Join(dir, "systemv", "v2ray")
|
|
|
- if err := copyConfigFile(src, dest, goOS, false); err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- return nil
|
|
|
+ return nil
|
|
|
}
|