Simplify error handling syntax

clip/arguments.go

@@ -36,15 +36,13 @@ func CopyShortcut(realPath string, field int) error {
 			fmt.Println(back.AnsiWarning + "[Starting]" + back.AnsiReset + " TOTP clipboard refresher")
 			errorChan := make(chan error)
 			go TOTPCopier(decSlice[2], errorChan, nil) // "done" is not needed because the process runs until the program is killed
-			err = <-errorChan
-			if err != nil { // handle error from first copy
+			if err = <-errorChan; err != nil {         // handle error from first copy
 				return errors.New("error encountered in TOTP refresh process: " + err.Error())
 			}
 			select {} // block indefinitely
 		} else { // other
 			// copy field to clipboard; launch clipboard clearing process
-			err = CopyString(true, decSlice[field])
-			if err != nil {
+			if err = CopyString(true, decSlice[field]); err != nil {
 				return err
 			}
 			return nil
@@ -60,6 +58,5 @@ func ClearArgument() error {
 	if assignedContents == "" {
 		os.Exit(0) // use os.Exit instead of core.Exit, as this function runs out of a background subprocess that is invisible to the user (will never appear in GUI/TUI environment)
 	}
-	err := ClearProcess(assignedContents)
-	return err
+	return ClearProcess(assignedContents)
 }

clip/clipClearProcess.go

@@ -19,8 +19,7 @@ func ClearProcess(assignedContents string) error {
 	}
 
 	clearClipboard := func() error {
-		err := cmdClear.Run()
-		if err != nil {
+		if err := cmdClear.Run(); err != nil {
 			return errors.New("unable to clear clipboard")
 		}
 		back.Exit(0)
@@ -29,8 +28,7 @@ func ClearProcess(assignedContents string) error {
 
 	// if assignedContents is empty, clear the clipboard immediately and unconditionally
 	if assignedContents == "" {
-		err := clearClipboard()
-		if err != nil {
+		if err := clearClipboard(); err != nil {
 			return err
 		}
 		return nil

clip/copy_MAC.go

@@ -13,8 +13,7 @@ import (
 func CopyString(clearClipboardAutomatically bool, copySubject string) error {
 	cmd := exec.Command("pbcopy")
 	_ = back.WriteToStdin(cmd, copySubject)
-	err := cmd.Run()
-	if err != nil {
+	if err := cmd.Run(); err != nil {
 		return errors.New("unable to copy to clipboard: " + err.Error())
 	}
 	if clearClipboardAutomatically {

clip/copy_TERMUX.go

@@ -13,8 +13,7 @@ import (
 func CopyString(clearClipboardAutomatically bool, copySubject string) error {
 	cmd := exec.Command("termux-clipboard-set")
 	_ = back.WriteToStdin(cmd, copySubject)
-	err := cmd.Run()
-	if err != nil {
+	if err := cmd.Run(); err != nil {
 		return errors.New("unable to copy to clipboard: " + err.Error())
 	}
 	if clearClipboardAutomatically {

clip/copy_UNIX.go

@@ -25,8 +25,7 @@ func CopyString(clearClipboardAutomatically bool, copySubject string) error {
 	}
 
 	_ = back.WriteToStdin(cmdCopy, copySubject)
-	err = cmdCopy.Run()
-	if err != nil {
+	if err = cmdCopy.Run(); err != nil {
 		return errors.New("unable to copy to clipboard: " + err.Error())
 	}
 	if clearClipboardAutomatically {

clip/copy_WIN.go

@@ -12,8 +12,7 @@ import (
 // CopyString copies a string to the clipboard.
 func CopyString(clearClipboardAutomatically bool, copySubject string) error {
 	cmd := exec.Command("powershell.exe", "-c", fmt.Sprintf("echo '%s' | Set-Clipboard", strings.ReplaceAll(copySubject, "'", "''")))
-	err := cmd.Run()
-	if err != nil {
+	if err := cmd.Run(); err != nil {
 		return errors.New("unable to copy to clipboard: " + err.Error())
 	}
 	if clearClipboardAutomatically {

clip/totp.go

@@ -17,8 +17,7 @@ func TOTPCopier(secret string, errorChan chan<- error, done <-chan bool) {
 		if err != nil {
 			errorChan <- err
 		}
-		err = CopyString(false, token)
-		if err != nil {
+		if err = CopyString(false, token); err != nil {
 			errorChan <- err
 		}