From 2fc19dd97e50a30b68d57a8ea26941a269e5c1c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?= <i@haozi.net>
Date: Sat, 28 Sep 2024 10:16:02 +0800
Subject: [PATCH] fix: lint

---
 internal/apps/percona/service.go |  4 ++--
 internal/apps/rsync/service.go   |  4 ++--
 internal/apps/s3fs/service.go    | 12 ++++++------
 internal/data/cron.go            |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/internal/apps/percona/service.go b/internal/apps/percona/service.go
index 31abdf4e..b2f1be7c 100644
--- a/internal/apps/percona/service.go
+++ b/internal/apps/percona/service.go
@@ -80,9 +80,9 @@ func (s *Service) Load(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	raw, err := shell.Execf(`mysqladmin -u root -p "%s" extended-status 2>&1`, rootPassword)
+	raw, err := shell.Execf(`mysqladmin -u root -p "%s" extended-status`, rootPassword)
 	if err != nil {
-		service.Error(w, http.StatusInternalServerError, "获取MySQL负载失败")
+		service.Error(w, http.StatusInternalServerError, "获取 Percona 负载失败")
 		return
 	}
 
diff --git a/internal/apps/rsync/service.go b/internal/apps/rsync/service.go
index 5ebce88f..a94776c4 100644
--- a/internal/apps/rsync/service.go
+++ b/internal/apps/rsync/service.go
@@ -247,7 +247,7 @@ secrets file = /etc/rsyncd.secrets
 	match := regexp.MustCompile(`auth users = ([^\n]+)`).FindStringSubmatch(module)
 	if len(match) == 2 {
 		authUser := match[1]
-		if _, err = shell.Execf("sed -i '/^" + authUser + ":.*$/d' /etc/rsyncd.secrets"); err != nil {
+		if _, err = shell.Execf(`sed -i '/^%s:.*$/d' /etc/rsyncd.secrets`, authUser); err != nil {
 			service.Error(w, http.StatusInternalServerError, err.Error())
 			return
 		}
@@ -257,7 +257,7 @@ secrets file = /etc/rsyncd.secrets
 		service.Error(w, http.StatusInternalServerError, err.Error())
 		return
 	}
-	if _, err = shell.Execf("echo '" + req.AuthUser + ":" + req.Secret + "' >> /etc/rsyncd.secrets"); err != nil {
+	if err = io.WriteAppend("/etc/rsyncd.secrets", fmt.Sprintf(`%s:%s\n`, req.AuthUser, req.Secret)); err != nil {
 		service.Error(w, http.StatusInternalServerError, err.Error())
 		return
 	}
diff --git a/internal/apps/s3fs/service.go b/internal/apps/s3fs/service.go
index 08271a1d..11e48a16 100644
--- a/internal/apps/s3fs/service.go
+++ b/internal/apps/s3fs/service.go
@@ -102,12 +102,12 @@ func (s *Service) Create(w http.ResponseWriter, r *http.Request) {
 		service.Error(w, http.StatusInternalServerError, err.Error())
 		return
 	}
-	if mountCheck, err := shell.Execf("mount -a 2>&1"); err != nil {
+	if mountCheck, err := shell.Execf("mount -a"); err != nil {
 		_, _ = shell.Execf(`sed -i 's@^s3fs#%s\s%s.*$@@g' /etc/fstab`, req.Bucket, req.Path)
 		service.Error(w, http.StatusInternalServerError, "/etc/fstab 有误: "+mountCheck)
 		return
 	}
-	if _, err := shell.Execf("df -h | grep " + req.Path + " 2>&1"); err != nil {
+	if _, err := shell.Execf(`df -h | grep '%s'`, req.Path); err != nil {
 		_, _ = shell.Execf(`sed -i 's@^s3fs#%s\s%s.*$@@g' /etc/fstab`, req.Bucket, req.Path)
 		service.Error(w, http.StatusInternalServerError, "挂载失败，请检查配置是否正确")
 		return
@@ -164,19 +164,19 @@ func (s *Service) Delete(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if _, err = shell.Execf(`fusermount -u '` + mount.Path + `' 2>&1`); err != nil {
+	if _, err = shell.Execf(`fusermount -u '%s'`, mount.Path); err != nil {
 		service.Error(w, http.StatusInternalServerError, err.Error())
 		return
 	}
-	if _, err = shell.Execf(`umount '` + mount.Path + `' 2>&1`); err != nil {
+	if _, err = shell.Execf(`umount '%s'`, mount.Path); err != nil {
 		service.Error(w, http.StatusInternalServerError, err.Error())
 		return
 	}
-	if _, err = shell.Execf(`sed -i 's@^s3fs#` + mount.Bucket + `\s` + mount.Path + `.*$@@g' /etc/fstab`); err != nil {
+	if _, err = shell.Execf(`sed -i 's@^s3fs#%s\s%s.*$@@g' /etc/fstab`, mount.Bucket, mount.Path); err != nil {
 		service.Error(w, http.StatusInternalServerError, err.Error())
 		return
 	}
-	if mountCheck, err := shell.Execf("mount -a 2>&1"); err != nil {
+	if mountCheck, err := shell.Execf("mount -a"); err != nil {
 		service.Error(w, http.StatusInternalServerError, "/etc/fstab 有误: "+mountCheck)
 		return
 	}
diff --git a/internal/data/cron.go b/internal/data/cron.go
index 86f2a735..85a9d71c 100644
--- a/internal/data/cron.go
+++ b/internal/data/cron.go
@@ -79,7 +79,7 @@ name=%s
 save=%d
 
 # 执行备份
-panel backup ${type} ${name} ${path} ${save} 2>&1
+panel backup ${type} ${name} ${path} ${save}
 `, req.BackupType, req.BackupPath, req.Target, req.Save)
 	}
 	if req.Type == "cutoff" {
@@ -92,7 +92,7 @@ name=%s
 save=%d
 
 # 执行切割
-panel cutoff ${name} ${save} 2>&1
+panel cutoff ${name} ${save}
 `, req.Target, req.Save)
 	}