Compare commits

..

No commits in common. "f4e93c5d314b3d9bbca32a2435647f34bda9786f" and "a4568ba69de33f3c4bef7d477d9270be0615b4ff" have entirely different histories.

3 changed files with 6 additions and 36 deletions

1
.gitignore vendored
View file

@ -28,4 +28,3 @@ go.work.sum
testconfig.json testconfig.json
go.sum go.sum
main main
output

View file

@ -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

View file

@ -7,9 +7,7 @@ import (
"fmt" "fmt"
"log" "log"
"os" "os"
"os/exec"
"path/filepath" "path/filepath"
"runtime"
"miku/supporter" "miku/supporter"
@ -51,7 +49,7 @@ func main() {
} }
fullpath, err := filepath.Abs(configPath) fullpath, err := filepath.Abs(configPath)
if err != nil { if err != nil {
return err return nil
} }
fmt.Println(fullpath) fmt.Println(fullpath)
file, err := os.ReadFile(fullpath) file, err := os.ReadFile(fullpath)
@ -77,15 +75,11 @@ func main() {
} }
newJson, err := json.MarshalIndent(newConfig, "", "\t") newJson, err := json.MarshalIndent(newConfig, "", "\t")
if err != nil { if err != nil {
return err return nil
} }
fileToWrite.Write(newJson) fileToWrite.Write(newJson)
fmt.Printf("Пользователь %s добавлен в конфиг %s\n", c.Args().First(), fullpath) fmt.Printf("Пользователь %s добавлен в конфиг %s\n", c.Args().First(), fullpath)
fmt.Printf("Vless URL: %s\n", vlessUsers.VlessURL(c.Args().First(), domain)) 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 return nil
}, },
}, },
@ -138,14 +132,10 @@ func main() {
} }
newJson, err := json.MarshalIndent(newConfig, "", "\t") newJson, err := json.MarshalIndent(newConfig, "", "\t")
if err != nil { if err != nil {
return err return nil
} }
fileToWrite.Write(newJson) fileToWrite.Write(newJson)
fmt.Printf("Пользователь %s удален из конфига %s", c.Args().First(), fullpath) 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 return nil
}, },
}, },
@ -169,7 +159,7 @@ func main() {
} }
fullpath, err := filepath.Abs(configPath) fullpath, err := filepath.Abs(configPath)
if err != nil { if err != nil {
return err return nil
} }
fmt.Println(fullpath) fmt.Println(fullpath)
file, err := os.ReadFile(fullpath) file, err := os.ReadFile(fullpath)
@ -215,7 +205,7 @@ func main() {
} }
fullpath, err := filepath.Abs(configPath) fullpath, err := filepath.Abs(configPath)
if err != nil { if err != nil {
return err return nil
} }
fmt.Println(fullpath) fmt.Println(fullpath)
file, err := os.ReadFile(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 { if err := cmd.Run(context.Background(), os.Args); err != nil {
log.Fatal(err) log.Fatal(err)
} }