Change coding standard

LeoOnTheEarth · LeoOnTheEarth · commit d4aae3cc9129 · 2025-02-17T11:56:17.000+08:00
diff --git a/ansible/ansible.go b/ansible/ansible.go
@@ -25,11 +25,11 @@ func New(commandFactory command.Factory) *Ansible {
 func (ansible *Ansible) Install(osName, sudoPassword string) (err error) {
 	var installed bool
 
-	if installed, err = ansible.isInstalled(); nil != err {
+	if installed, err = ansible.isInstalled(); err != nil {
 		return err
 	}
 
-	if false == installed {
+	if !installed {
 		switch osName {
 		case "oracle-linux":
 			commands := []*command.Command{
@@ -53,12 +53,12 @@ func (ansible *Ansible) Install(osName, sudoPassword string) (err error) {
 			}
 
 			printer.Printf("\n<comment>$ %s</comment>\n", commands[2].String())
-			if err = commands[2].Run(); nil != err {
+			if err = commands[2].Run(); err != nil {
 				return err
 			}
 
 			printer.Printf("\n<comment>$ %s</comment>\n", commands[3].String())
-			if err = commands[3].Run(); nil != err {
+			if err = commands[3].Run(); err != nil {
 				return err
 			}
 		default:
@@ -88,7 +88,7 @@ func (ansible *Ansible) RunAnsiblePlaybook(playbookFilePath, variableFilePath, s
 	}
 
 	printer.Printf("\n<comment>$ %s</comment>\n", cmd.String())
-	if err = cmd.Run(); nil != err {
+	if err = cmd.Run(); err != nil {
 		return err
 	}
 
@@ -99,13 +99,13 @@ func (ansible *Ansible) isInstalled() (installed bool, err error) {
 	var path string
 	var realPath string
 
-	if path, err = ansible.commandFactory.NewCommand("which", "ansible").Output(); nil != err && "exit status 1" != err.Error() {
+	if path, err = ansible.commandFactory.NewCommand("which", "ansible").Output(); err != nil && "exit status 1" != err.Error() {
 		return false, err
 	}
 	path = strings.TrimSpace(path)
 
-	if "" != path {
-		if realPath, err = ansible.commandFactory.NewCommand("ls", path).Output(); nil != err {
+	if path != "" {
+		if realPath, err = ansible.commandFactory.NewCommand("ls", path).Output(); err != nil {
 			return false, err
 		}
 
diff --git a/command/argument.go b/command/argument.go
@@ -15,7 +15,7 @@ func (arg *argument) ToString(hideSecret bool) string {
 		return "***secret***"
 	}
 
-	if strings.Contains(arg.Value, " ") || strings.Contains(arg.Value, "\"") {
+	if strings.Contains(arg.Value, " ") || strings.Contains(arg.Value, `"`) {
 		return fmt.Sprintf(`"%s"`, strings.ReplaceAll(arg.Value, `"`, `\"`))
 	}
 
diff --git a/hosts/hosts.go b/hosts/hosts.go
@@ -21,7 +21,7 @@ func IsHostsChanged(comment, newHostsFilePath, systemHostsFilePath string) (chan
 	if _, oldHostsBuff, err = loadHostsFile(systemHostsFilePath, startMessage, endMessage); err != nil {
 		return changed, err
 	}
-	if newHosts, err = os.ReadFile(newHostsFilePath); nil != err {
+	if newHosts, err = os.ReadFile(newHostsFilePath); err != nil {
 		return changed, err
 	}
 
@@ -42,7 +42,7 @@ func UpdateHostsFile(comment, newHostsFilePath, systemHostsFilePath string) (err
 		return err
 	}
 
-	if newHosts, err = os.ReadFile(newHostsFilePath); nil != err {
+	if newHosts, err = os.ReadFile(newHostsFilePath); err != nil {
 		return err
 	}
 
@@ -66,7 +66,7 @@ func loadHostsFile(filepath, startMessage, endMessage string) (buff bytes.Buffer
 	}
 
 	var file *os.File
-	if file, err = os.Open(filepath); nil != err {
+	if file, err = os.Open(filepath); err != nil {
 		return buff, oldBuff, err
 	}
 
@@ -90,7 +90,7 @@ func loadHostsFile(filepath, startMessage, endMessage string) (buff bytes.Buffer
 			continue
 		}
 
-		if (false == hasStart && false == hasEnd) || (true == hasStart && true == hasEnd) {
+		if (!hasStart && !hasEnd) || (hasStart && hasEnd) {
 			buff.WriteString(line)
 			buff.WriteRune('\n')
 		} else {
@@ -99,7 +99,7 @@ func loadHostsFile(filepath, startMessage, endMessage string) (buff bytes.Buffer
 		}
 	}
 
-	if err = file.Close(); nil != err {
+	if err = file.Close(); err != nil {
 		return buff, oldBuff, err
 	}
 
diff --git a/uac/uac.go b/uac/uac.go
@@ -28,7 +28,7 @@ func PromptWithExtraArguments(messageFilePath string, maxWaitTime time.Duration,
 		err := job()
 		message := []byte("")
 
-		if nil != err {
+		if err != nil {
 			message = []byte(err.Error())
 		}
 
diff --git a/wsl/task.go b/wsl/task.go
@@ -32,13 +32,13 @@ func CreateTaskForStartSystemd(distribution string) (err error) {
 	}
 	defer rootFolder.Release()
 
-	if false == hasSubFolder(rootFolder, taskFolderName) {
+	if !hasSubFolder(rootFolder, taskFolderName) {
 		if err = createSubFolder(rootFolder, taskFolderName); err != nil {
 			log.Fatal(err)
 		}
 	}
 
-	if true == hasTask(rootFolder, taskPath) {
+	if hasTask(rootFolder, taskPath) {
 		if _, err = oleutil.CallMethod(rootFolder, "DeleteTask", taskPath, 0); err != nil {
 			return err
 		}
@@ -112,7 +112,7 @@ func getTaskService() (service *ole.IDispatch, err error) {
 		return nil, err
 	}
 
-	if nil == scheduler {
+	if scheduler == nil {
 		ole.CoUninitialize()
 		return nil, errors.New("could not create ITaskService instance")
 	}
@@ -170,7 +170,7 @@ func getUsername() (username string, err error) {
 	parts := strings.Split(currentUser.Username, `\`)
 
 	if len(parts) > 0 {
-		if 1 == len(parts) {
+		if len(parts) == 1 {
 			return parts[0], nil
 		} else {
 			return parts[1], nil
diff --git a/wsl/wsl.go b/wsl/wsl.go
@@ -70,7 +70,7 @@ func EnableSystemd(distribution string) (err error) {
 		var terminateResult string
 
 		if terminateResult, err = command.New("wsl", "--terminate", distribution).Output(); err != nil {
-			if "The operation completed successfully." != strings.TrimSpace(terminateResult) {
+			if strings.TrimSpace(terminateResult) != "The operation completed successfully." {
 				return err
 			}
 		}
@@ -101,18 +101,18 @@ func updateWslConfFile(distribution, content string) (modified bool, err error)
 		return modified, err
 	}
 
-	if false == cfg.HasSection("boot") {
+	if !cfg.HasSection("boot") {
 		if _, err = cfg.NewSection("boot"); err != nil {
 			return modified, err
 		}
 	}
 
-	if false == cfg.Section("boot").HasKey("systemd") {
+	if !cfg.Section("boot").HasKey("systemd") {
 		if _, err = cfg.Section("boot").NewKey("systemd", "true"); err != nil {
 			return modified, err
 		}
 		modified = true
-	} else if "true" != cfg.Section("boot").Key("systemd").Value() {
+	} else if cfg.Section("boot").Key("systemd").Value() != "true" {
 		cfg.Section("boot").Key("systemd").SetValue("true")
 		modified = true
 	}

Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,11 @@ func New(commandFactory command.Factory) *Ansible {`
`25`	`25`	`func (ansible *Ansible) Install(osName, sudoPassword string) (err error) {`
`26`	`26`	`var installed bool`
`27`	`27`
`28`		`- if installed, err = ansible.isInstalled(); nil != err {`
	`28`	`+ if installed, err = ansible.isInstalled(); err != nil {`
`29`	`29`	`return err`
`30`	`30`	`}`
`31`	`31`
`32`		`- if false == installed {`
	`32`	`+ if !installed {`
`33`	`33`	`switch osName {`
`34`	`34`	`case "oracle-linux":`
`35`	`35`	`commands := []*command.Command{`
`@@ -53,12 +53,12 @@ func (ansible *Ansible) Install(osName, sudoPassword string) (err error) {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`printer.Printf("\n<comment>$ %s</comment>\n", commands[2].String())`
`56`		`- if err = commands[2].Run(); nil != err {`
	`56`	`+ if err = commands[2].Run(); err != nil {`
`57`	`57`	`return err`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`printer.Printf("\n<comment>$ %s</comment>\n", commands[3].String())`
`61`		`- if err = commands[3].Run(); nil != err {`
	`61`	`+ if err = commands[3].Run(); err != nil {`
`62`	`62`	`return err`
`63`	`63`	`}`
`64`	`64`	`default:`
`@@ -88,7 +88,7 @@ func (ansible *Ansible) RunAnsiblePlaybook(playbookFilePath, variableFilePath, s`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`printer.Printf("\n<comment>$ %s</comment>\n", cmd.String())`
`91`		`- if err = cmd.Run(); nil != err {`
	`91`	`+ if err = cmd.Run(); err != nil {`
`92`	`92`	`return err`
`93`	`93`	`}`
`94`	`94`
`@@ -99,13 +99,13 @@ func (ansible *Ansible) isInstalled() (installed bool, err error) {`
`99`	`99`	`var path string`
`100`	`100`	`var realPath string`
`101`	`101`
`102`		`- if path, err = ansible.commandFactory.NewCommand("which", "ansible").Output(); nil != err && "exit status 1" != err.Error() {`
	`102`	`+ if path, err = ansible.commandFactory.NewCommand("which", "ansible").Output(); err != nil && "exit status 1" != err.Error() {`
`103`	`103`	`return false, err`
`104`	`104`	`}`
`105`	`105`	`path = strings.TrimSpace(path)`
`106`	`106`
`107`		`- if "" != path {`
`108`		`- if realPath, err = ansible.commandFactory.NewCommand("ls", path).Output(); nil != err {`
	`107`	`+ if path != "" {`
	`108`	`+ if realPath, err = ansible.commandFactory.NewCommand("ls", path).Output(); err != nil {`
`109`	`109`	`return false, err`
`110`	`110`	`}`
`111`	`111`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ func (arg *argument) ToString(hideSecret bool) string {`
`15`	`15`	`return "*secret*"`
`16`	`16`	`}`
`17`	`17`
`18`		`- if strings.Contains(arg.Value, " ") \|\| strings.Contains(arg.Value, "\"") {`
	`18`	+ if strings.Contains(arg.Value, " ") \|\| strings.Contains(arg.Value, `"`) {
`19`	`19`	return fmt.Sprintf(`"%s"`, strings.ReplaceAll(arg.Value, `"`, `\"`))
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ func IsHostsChanged(comment, newHostsFilePath, systemHostsFilePath string) (chan`
`21`	`21`	`if _, oldHostsBuff, err = loadHostsFile(systemHostsFilePath, startMessage, endMessage); err != nil {`
`22`	`22`	`return changed, err`
`23`	`23`	`}`
`24`		`- if newHosts, err = os.ReadFile(newHostsFilePath); nil != err {`
	`24`	`+ if newHosts, err = os.ReadFile(newHostsFilePath); err != nil {`
`25`	`25`	`return changed, err`
`26`	`26`	`}`
`27`	`27`
`@@ -42,7 +42,7 @@ func UpdateHostsFile(comment, newHostsFilePath, systemHostsFilePath string) (err`
`42`	`42`	`return err`
`43`	`43`	`}`
`44`	`44`
`45`		`- if newHosts, err = os.ReadFile(newHostsFilePath); nil != err {`
	`45`	`+ if newHosts, err = os.ReadFile(newHostsFilePath); err != nil {`
`46`	`46`	`return err`
`47`	`47`	`}`
`48`	`48`
`@@ -66,7 +66,7 @@ func loadHostsFile(filepath, startMessage, endMessage string) (buff bytes.Buffer`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`var file *os.File`
`69`		`- if file, err = os.Open(filepath); nil != err {`
	`69`	`+ if file, err = os.Open(filepath); err != nil {`
`70`	`70`	`return buff, oldBuff, err`
`71`	`71`	`}`
`72`	`72`
`@@ -90,7 +90,7 @@ func loadHostsFile(filepath, startMessage, endMessage string) (buff bytes.Buffer`
`90`	`90`	`continue`
`91`	`91`	`}`
`92`	`92`
`93`		`- if (false == hasStart && false == hasEnd) \|\| (true == hasStart && true == hasEnd) {`
	`93`	`+ if (!hasStart && !hasEnd) \|\| (hasStart && hasEnd) {`
`94`	`94`	`buff.WriteString(line)`
`95`	`95`	`buff.WriteRune('\n')`
`96`	`96`	`} else {`
`@@ -99,7 +99,7 @@ func loadHostsFile(filepath, startMessage, endMessage string) (buff bytes.Buffer`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
`102`		`- if err = file.Close(); nil != err {`
	`102`	`+ if err = file.Close(); err != nil {`
`103`	`103`	`return buff, oldBuff, err`
`104`	`104`	`}`
`105`	`105`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ func PromptWithExtraArguments(messageFilePath string, maxWaitTime time.Duration,`
`28`	`28`	`err := job()`
`29`	`29`	`message := []byte("")`
`30`	`30`
`31`		`- if nil != err {`
	`31`	`+ if err != nil {`
`32`	`32`	`message = []byte(err.Error())`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -32,13 +32,13 @@ func CreateTaskForStartSystemd(distribution string) (err error) {`
`32`	`32`	`}`
`33`	`33`	`defer rootFolder.Release()`
`34`	`34`
`35`		`- if false == hasSubFolder(rootFolder, taskFolderName) {`
	`35`	`+ if !hasSubFolder(rootFolder, taskFolderName) {`
`36`	`36`	`if err = createSubFolder(rootFolder, taskFolderName); err != nil {`
`37`	`37`	`log.Fatal(err)`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`41`		`- if true == hasTask(rootFolder, taskPath) {`
	`41`	`+ if hasTask(rootFolder, taskPath) {`
`42`	`42`	`if _, err = oleutil.CallMethod(rootFolder, "DeleteTask", taskPath, 0); err != nil {`
`43`	`43`	`return err`
`44`	`44`	`}`
`@@ -112,7 +112,7 @@ func getTaskService() (service *ole.IDispatch, err error) {`
`112`	`112`	`return nil, err`
`113`	`113`	`}`
`114`	`114`
`115`		`- if nil == scheduler {`
	`115`	`+ if scheduler == nil {`
`116`	`116`	`ole.CoUninitialize()`
`117`	`117`	`return nil, errors.New("could not create ITaskService instance")`
`118`	`118`	`}`
`@@ -170,7 +170,7 @@ func getUsername() (username string, err error) {`
`170`	`170`	parts := strings.Split(currentUser.Username, `\`)
`171`	`171`
`172`	`172`	`if len(parts) > 0 {`
`173`		`- if 1 == len(parts) {`
	`173`	`+ if len(parts) == 1 {`
`174`	`174`	`return parts[0], nil`
`175`	`175`	`} else {`
`176`	`176`	`return parts[1], nil`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ func EnableSystemd(distribution string) (err error) {`
`70`	`70`	`var terminateResult string`
`71`	`71`
`72`	`72`	`if terminateResult, err = command.New("wsl", "--terminate", distribution).Output(); err != nil {`
`73`		`- if "The operation completed successfully." != strings.TrimSpace(terminateResult) {`
	`73`	`+ if strings.TrimSpace(terminateResult) != "The operation completed successfully." {`
`74`	`74`	`return err`
`75`	`75`	`}`
`76`	`76`	`}`
`@@ -101,18 +101,18 @@ func updateWslConfFile(distribution, content string) (modified bool, err error)`
`101`	`101`	`return modified, err`
`102`	`102`	`}`
`103`	`103`
`104`		`- if false == cfg.HasSection("boot") {`
	`104`	`+ if !cfg.HasSection("boot") {`
`105`	`105`	`if _, err = cfg.NewSection("boot"); err != nil {`
`106`	`106`	`return modified, err`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`110`		`- if false == cfg.Section("boot").HasKey("systemd") {`
	`110`	`+ if !cfg.Section("boot").HasKey("systemd") {`
`111`	`111`	`if _, err = cfg.Section("boot").NewKey("systemd", "true"); err != nil {`
`112`	`112`	`return modified, err`
`113`	`113`	`}`
`114`	`114`	`modified = true`
`115`		`- } else if "true" != cfg.Section("boot").Key("systemd").Value() {`
	`115`	`+ } else if cfg.Section("boot").Key("systemd").Value() != "true" {`
`116`	`116`	`cfg.Section("boot").Key("systemd").SetValue("true")`
`117`	`117`	`modified = true`
`118`	`118`	`}`