clean up some unnecessary dependencies, logics, and linter warnings (#963)

Signed-off-by: Tiger Wang <tigerwang@outlook.com>
This commit is contained in:
Tiger Wang
2023-03-18 20:55:51 -04:00
committed by GitHub
parent f530f69ba5
commit 717b47ca2c
15 changed files with 267 additions and 275 deletions

View File

@@ -14,14 +14,18 @@ func OnlyExec(cmdStr string) {
cmd := exec.Command("/bin/bash", "-c", cmdStr)
stdout, err := cmd.StdoutPipe()
if err != nil {
fmt.Println(err)
return
}
defer stdout.Close()
if err := cmd.Start(); err != nil {
fmt.Println(err)
return
}
cmd.Wait()
return
if err := cmd.Wait(); err != nil {
fmt.Println(err)
}
}
func ExecResultStrArray(cmdStr string) []string {
@@ -49,7 +53,11 @@ func ExecResultStrArray(cmdStr string) []string {
}
networklist = append(networklist, string(output))
}
cmd.Wait()
if err := cmd.Wait(); err != nil {
fmt.Println(err)
}
return networklist
}
@@ -68,11 +76,15 @@ func ExecResultStr(cmdStr string) string {
return ""
}
str, err := ioutil.ReadAll(stdout)
cmd.Wait()
if err != nil {
fmt.Println(err)
return ""
}
if err := cmd.Wait(); err != nil {
fmt.Println(err)
}
return string(str)
}

View File

@@ -1,19 +1,23 @@
package command
package command_test
import (
"os"
"testing"
"github.com/IceWhaleTech/CasaOS/pkg/utils/command"
"go.uber.org/goleak"
"gotest.tools/assert"
)
func TestExecuteScripts(t *testing.T) {
goleak.VerifyNone(t)
// make a temp directory
tmpDir, err := os.MkdirTemp("", "casaos-test-*")
assert.NilError(t, err)
defer os.RemoveAll(tmpDir)
ExecuteScripts(tmpDir)
command.ExecuteScripts(tmpDir)
// create a sample script under tmpDir
script := tmpDir + "/test.sh"
@@ -25,5 +29,5 @@ func TestExecuteScripts(t *testing.T) {
_, err = f.WriteString("#!/bin/bash\necho 123")
assert.NilError(t, err)
ExecuteScripts(tmpDir)
command.ExecuteScripts(tmpDir)
}