diff --git a/.gitignore b/.gitignore index 10d64c1..9fa1115 100644 --- a/.gitignore +++ b/.gitignore @@ -27,5 +27,4 @@ go.work.sum testconfig.json go.sum -main -output \ No newline at end of file +main \ No newline at end of file diff --git a/Makefile b/Makefile deleted file mode 100644 index edb5825..0000000 --- a/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -miku : users/go.sum supporter/go.sum miku/go.sum miku/main - mkdir output - mv miku/main output/miku - -users/go.sum : - cd users && go mod tidy && cd ../ -supporter/go.sum : - cd supporter && go mod tidy && cd ../ -miku/go.sum : - cd miku && go mod tidy && cd ../ -miku/main : - go build -C miku - -clean : - rm -rf output users/go.sum supporter/go.sum miku/go.sum miku/main - diff --git a/miku/main.go b/miku/main.go index 442deae..9b28c7d 100644 --- a/miku/main.go +++ b/miku/main.go @@ -7,9 +7,7 @@ import ( "fmt" "log" "os" - "os/exec" "path/filepath" - "runtime" "miku/supporter" @@ -51,7 +49,7 @@ func main() { } fullpath, err := filepath.Abs(configPath) if err != nil { - return err + return nil } fmt.Println(fullpath) file, err := os.ReadFile(fullpath) @@ -77,15 +75,11 @@ func main() { } newJson, err := json.MarshalIndent(newConfig, "", "\t") if err != nil { - return err + return nil } fileToWrite.Write(newJson) fmt.Printf("Пользователь %s добавлен в конфиг %s\n", c.Args().First(), fullpath) fmt.Printf("Vless URL: %s\n", vlessUsers.VlessURL(c.Args().First(), domain)) - sysd := exec.Command("systemctl", "reload", "sing-box") - if err := sysd.Run(); err != nil { - return err - } return nil }, }, @@ -138,14 +132,10 @@ func main() { } newJson, err := json.MarshalIndent(newConfig, "", "\t") if err != nil { - return err + return nil } fileToWrite.Write(newJson) fmt.Printf("Пользователь %s удален из конфига %s", c.Args().First(), fullpath) - sysd := exec.Command("systemctl", "reload", "sing-box") - if err := sysd.Run(); err != nil { - return err - } return nil }, }, @@ -169,7 +159,7 @@ func main() { } fullpath, err := filepath.Abs(configPath) if err != nil { - return err + return nil } fmt.Println(fullpath) file, err := os.ReadFile(fullpath) @@ -215,7 +205,7 @@ func main() { } fullpath, err := filepath.Abs(configPath) if err != nil { - return err + return nil } fmt.Println(fullpath) file, err := os.ReadFile(fullpath) @@ -233,9 +223,6 @@ func main() { }, }, } - if runtime.GOOS != "linux" { - log.Fatal(errors.New("Неподдерживаемая ОС")) - } if err := cmd.Run(context.Background(), os.Args); err != nil { log.Fatal(err) }