Code refactoring

cli/cli.go

@@ -549,11 +549,11 @@ func printCompletion() int {
 
 	switch options.GetS(OPT_COMPLETION) {
 	case "bash":
-		fmt.Printf(bash.Generate(info, APP))
+		fmt.Print(bash.Generate(info, APP))
 	case "fish":
-		fmt.Printf(fish.Generate(info, APP))
+		fmt.Print(fish.Generate(info, APP))
 	case "zsh":
-		fmt.Printf(zsh.Generate(info, optMap, APP))
+		fmt.Print(zsh.Generate(info, optMap, APP))
 	default:
 		return 1
 	}
@@ -571,18 +571,6 @@ func printMan() {
 	)
 }
 
-// genMan generates man page
-func genMan() int {
-	fmt.Println(
-		man.Generate(
-			genUsage(),
-			genAbout(""),
-		),
-	)
-
-	return 0
-}
-
 // genUsage generates usage info
 func genUsage() *usage.Info {
 	info := usage.NewInfo()

cli/cmd_cleanup.go

@@ -195,9 +195,3 @@ func getMainPackageFromBundle(bundle repo.PackageBundle) *repo.Package {
 
 	return nil
 }
-
-// printEmptyFoundPackageList prints empty packages listing
-func printEmptyFoundPackageList(r *repo.SubRepository) {
-	fmtutil.Separator(true, strings.ToUpper(r.Name))
-	fmtc.Println("\n{s-}-- no packages --{!}\n")
-}

cli/cmd_gen_key.go

@@ -8,7 +8,6 @@ package cli
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 import (
-	"io/ioutil"
 	"os"
 	"regexp"
 	"strings"
@@ -130,15 +129,15 @@ func generateKeys(name, email string, password *secstr.String, outputPubKeyFile
 		return false
 	}
 
-	err = ioutil.WriteFile(outputPrivKeyFile, privKeyData, 0600)
+	err = os.WriteFile(outputPrivKeyFile, privKeyData, 0600)
 
 	if err != nil {
 		spinner.Update("Can't save private key: %v", err)
 		spinner.Done(false)
 		return false
 	}
 
-	err = ioutil.WriteFile(outputPubKeyFile, pubKeyData, 0644)
+	err = os.WriteFile(outputPubKeyFile, pubKeyData, 0644)
 
 	if err != nil {
 		spinner.Update("Can't save public key: %v", err)

cli/cmd_help.go

@@ -108,7 +108,7 @@ func (c *commandHelp) Options() {
 			continue
 		}
 
-		option.Render()
+		option.Print()
 	}
 
 	fmtc.NewLine()
@@ -210,7 +210,7 @@ func helpAll() {
 			continue
 		}
 
-		c.Render()
+		c.Print()
 	}
 
 	fmtc.NewLine()

cli/cmd_resign.go

@@ -55,7 +55,7 @@ how many packages you have and how big they are).`)
 
 // resignAllPackages re-singes all packages in testing and release repositories
 func resignAllPackages(ctx *context, key *sign.Key) bool {
-	var isResigned bool
+	isResigned := false
 
 	if !resignRepoPackages(ctx, key, ctx.Repo.Testing) {
 		ctx.Logger.Get(data.REPO_TESTING).Print("Packages re-signing finished with error")

cli/common.go

@@ -325,8 +325,7 @@ func getRepoContext(repoCfg *knf.Config) (*context, error) {
 
 // getRepoStorage configures repository storage
 func getRepoStorage(typ string, repoCfg *knf.Config) (storage.Storage, error) {
-	switch typ {
-	case storage.TYPE_FS:
+	if typ == storage.TYPE_FS {
 		return getRepoFSStorage(repoCfg)
 	}