fix: remove "bash -c" in command (#275)

Task: https://pms.uniontech.com/task-view-385159.html

Author: zhaohuiw42

src/internal/updateplatform/message_report.go

@@ -1599,7 +1599,9 @@ func (m *UpdatePlatformManager) PrepareCheckScripts() {
 	for _, g := range checkGroups {
 		for _, c := range g.list {
 			filePath := filepath.Join(g.dir, c.Name)
-			content, err := base64.RawStdEncoding.DecodeString(c.Shell)
+			// Remove padding for StdEncoding, "IyEvYmluL2Jhc2gKCmVjaG8gImhlbGxvIGRlZXBpbiI="
+			shell := strings.TrimRight(c.Shell, "=")
+			content, err := base64.RawStdEncoding.DecodeString(shell)
 			if err != nil {
 				logger.Warningf("decode shell for %s failed: %v", c.Name, err)
 				continue

src/lastore-daemon/manager_update.go

@@ -213,7 +213,7 @@ func (m *Manager) updateSource(sender dbus.Sender) (*Job, error) {
 							ErrDetail: "failed to get update policy by token" + err.Error(),
 						}
 					} else {
-						logger.Warning("updatePlatform gen token failed", err)
+						logger.Warningf("updatePlatform gen token failed: %v", err)
 						return nil
 					}
 				}

src/lastore-update-tools/controller/check/check.go

@@ -119,7 +119,7 @@ func CheckDynHook(cfg *cache.CacheInfo, checkType int8) error {
 		for _, hookFile := range hookFiles {
 			hookPath := filepath.Join(hookDir, hookFile)
 			logger.Infof("Executing hook: %s", hookPath)
-			output, err := runcmd.RunnerOutput(60, "bash", hookPath)
+			output, err := runcmd.RunnerOutput(60, hookPath)
 			if err != nil {
 				return fmt.Errorf("hook execution failed: %s\nOutput:\n%s\nError:%s", hookPath, output, err.Error())
 			}

src/lastore-update-tools/sysinfo/diskinfo.go

@@ -6,6 +6,7 @@ package sysinfo
 
 import (
 	// "os/exec"
+	"fmt"
 	"strconv"
 	"strings"
 
@@ -37,23 +38,22 @@ import (
 // 	return freeSpace, nil
 // }
 
-// TODO:(DingHao) fix to udisksctl
-func GetRootDiskFreeSpace() (uint64, error) {
-	freeSpace, err := runcmd.RunnerOutput(10, "bash", "-c", "df -l --output=avail / | tail -n 1")
-	if err != nil {
-		return 0, err
+func parseDfAvailOuput(output string) (uint64, error) {
+	fields := strings.Fields(output)
+	if len(fields) == 0 {
+		return 0, fmt.Errorf("unexpected df output: %q", output)
 	}
+	return strconv.ParseUint(fields[len(fields)-1], 10, 64)
+}
 
-	// 将输出结果转换为字符串并去除空格
-	freeSpaceStr := strings.TrimSpace(string(freeSpace))
-
-	// 将字符串转换为uint64类型的整数
-	freeSpaceInt, err := strconv.ParseUint(freeSpaceStr, 10, 64)
+// TODO:(DingHao) fix to udisksctl
+func GetRootDiskFreeSpace() (uint64, error) {
+	freeSpace, err := runcmd.RunnerOutput(10, "df", "-l", "--output=avail", "/")
 	if err != nil {
 		return 0, err
 	}
 
-	return freeSpaceInt, nil
+	return parseDfAvailOuput(freeSpace)
 }
 
 // TODO:(DingHao) fix to udisksctl
@@ -66,19 +66,10 @@ func GetDataDiskFreeSpace() (uint64, error) {
 		return sysSpace, nil
 	}
 
-	freeSpace, err := runcmd.RunnerOutput(10, "bash", "-c", "df -l --output=avail /data | tail -n 1")
-	if err != nil {
-		return 0, err
-	}
-
-	// 将输出结果转换为字符串并去除空格
-	freeSpaceStr := strings.TrimSpace(string(freeSpace))
-
-	// 将字符串转换为uint64类型的整数
-	freeSpaceInt, err := strconv.ParseUint(freeSpaceStr, 10, 64)
+	freeSpace, err := runcmd.RunnerOutput(10, "df", "-l", "--output=avail", "/data")
 	if err != nil {
 		return 0, err
 	}
 
-	return freeSpaceInt, nil
+	return parseDfAvailOuput(freeSpace)
 }

src/lastore-update-tools/sysinfo/pkginfo.go

@@ -6,14 +6,16 @@ package sysinfo
 
 import (
 	"fmt"
-	"os/exec"
 	"strings"
 
+	"github.com/linuxdeepin/go-lib/log"
 	"github.com/linuxdeepin/lastore-daemon/src/lastore-update-tools/config/cache"
 	runcmd "github.com/linuxdeepin/lastore-daemon/src/lastore-update-tools/pkg/utils/cmd"
 	"github.com/linuxdeepin/lastore-daemon/src/lastore-update-tools/pkg/utils/fs"
 )
 
+var logger = log.NewLogger("lastore/update-tools/sysinfo")
+
 // CheckAppIsExist
 func CheckAppIsExist(app string) (bool, error) {
 	if err := fs.CheckFileExistState(app); err != nil {
@@ -29,28 +31,31 @@ func GetCurrInstPkgStat(pkgs map[string]*cache.AppTinyInfo) error {
 	}
 
 	// bash -c "dpkg -l | tail -n +6 | awk '{print $1,$2,$3}'"
-	outputStream, err := runcmd.RunnerOutput(10, "bash", "-c", "dpkg -l | tail -n +6 | awk '{print $1,$2,$3}'")
+	outputStream, err := runcmd.RunnerOutput(
+		10,
+		"dpkg-query",
+		"-W",
+		"-f=${db:Status-Abbrev} ${Package} ${Version}\n",
+	)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to run dpkg-query: %w", err)
 	}
-	// logger.Debug(outputStream)
 
+	logger.Debugf("dpkg-query output: %s", outputStream)
 	outputLines := strings.Split(outputStream, "\n")
 
-	// logger.Debugf("out:+%v", outputLines)
-
 	for _, line := range outputLines {
-		spv := strings.Split(line, " ")
+		spv := strings.Fields(line)
 		if len(spv) != 3 {
-			// logger.Debugf("skip line: %v", spv)
+			logger.Debugf("skip line: %v", spv)
 			continue
 		}
 		appInfo := cache.AppTinyInfo{
 			Name:    strings.Split(spv[1], ":")[0],
 			Version: spv[2],
 			State:   cache.PkgState(spv[0]),
 		}
-		// logger.Debugf("pkg:%+v", appInfo)
+		logger.Debugf("pkg:%+v", appInfo)
 
 		pkgs[appInfo.Name] = &appInfo
 		pkgs[fmt.Sprintf("%s#%s", appInfo.Name, appInfo.Version)] = &appInfo
@@ -62,19 +67,20 @@ func GetCurrInstPkgStat(pkgs map[string]*cache.AppTinyInfo) error {
 
 // ToDo:(DingHao)替换成袁老师的hash函数
 func GetSysPkgStateAndVersion(pkgname string) (string, string, error) {
-	command := "bash"
-	arg1 := "-c"
-	arg2 := "dpkg -l | tail -n +6 | awk '{print $1,$2,$3}'|grep \"^.. " + pkgname + " \""
-	cmd := exec.Command(command, arg1, arg2)
-	output, err := cmd.Output()
+	output, err := runcmd.RunnerOutput(
+		10,
+		"dpkg-query",
+		"-W",
+		"-f=${db:Status-Abbrev} ${Version}\n",
+		pkgname,
+	)
 	if err != nil {
 		return "", "", err
 	}
 
-	pkgInfo := strings.Split(string(output), " ")
-	if len(pkgInfo) != 3 {
-		// log.Debugf("failed format: %s len: %d", pkgInfo, len(pkgInfo))
+	pkgInfo := strings.Fields(output)
+	if len(pkgInfo) < 2 {
 		return "", "", fmt.Errorf("failed format: %s len: %d", pkgInfo, len(pkgInfo))
 	}
-	return pkgInfo[0], pkgInfo[2], nil
+	return pkgInfo[0], pkgInfo[1], nil
 }