vodorod/umbrix-libcore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix: compile issue in linux

Browse Source
This commit is contained in:
Hiddify
2024-02-05 20:22:42 +01:00
parent d96279386a
commit 6f2c1504c8
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd.sh
View File

@@ -1,3 +1,3 @@
TAGS=with_gvisor,with_quic,with_wireguard,with_ech,with_utls,with_clash_api,with_grpc TAGS=with_gvisor,with_quic,with_wireguard,with_ech,with_utls,with_clash_api,with_grpc
# TAGS=with_dhcp,with_low_memory,with_conntrack # TAGS=with_dhcp,with_low_memory,with_conntrack
go run --tags $(TAGS) ./cmd *@ go run --tags $TAGS ./cmd $@

17
config/admin_service_cmd_runner.go
View File

@@ -9,27 +9,24 @@ import (
) )
func ExecuteCmd(executablePath, args string) (string, error) { func ExecuteCmd(executablePath, args string) (string, error) {
err := execCmdImp([]string{"gksu", executablePath, args}) if err := execCmdImp([]string{"gksu", executablePath, args}); err == nil {
if err == nil {
return "Ok", nil return "Ok", nil
} }
err := execCmdImp([]string{"pkexec", executablePath, args}) if err := execCmdImp([]string{"pkexec", executablePath, args}); err == nil {
if err == nil {
return "Ok", nil return "Ok", nil
} }
err := execCmdImp([]string{"/bin/sh", "-c", "sudo " + executablePath + " " + args}) if err := execCmdImp([]string{"/bin/sh", "-c", "sudo " + executablePath + " " + args}); err == nil {
if err == nil {
return "Ok", nil return "Ok", nil
} }
return "", err return "", fmt.Errorf("Error executing run as root shell command")
} }
func execCmdImp(cmd []string) error { func execCmdImp(commands []string) error {
cmd := exec.Command(cmd[0], cmd[1:]) cmd := exec.Command(commands[0], commands[1:]...)
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
fmt.Printf("Running command: %v", cmd.String()) fmt.Printf("Running command: %v", commands)
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
fmt.Printf("Error: %v\n", err) fmt.Printf("Error: %v\n", err)
return err return err