Code refactoring

cli/cli.go

@@ -1498,7 +1498,7 @@ func getVersionFromFile() (string, error) {
 		return "", fmtc.Errorf("Can't read version file: %v", err)
 	}
 
-	versionName := strings.Trim(string(versionData[:]), " \n\r")
+	versionName := strings.Trim(string(versionData), " \n\r")
 
 	if versionName == "" {
 		return "", fmtc.Errorf("Can't use version file - file malformed")
@@ -1731,7 +1731,7 @@ func isVersionSupportedByBundler(rubyVersion string) bool {
 
 // getNameWithoutPatchLevel return name without -p0
 func getNameWithoutPatchLevel(name string) string {
-	return strings.Replace(name, "-p0", "", -1)
+	return strings.ReplaceAll(name, "-p0", "")
 }
 
 // parseGemInfo extract name and version of gem
@@ -1800,11 +1800,11 @@ func printCompletion() int {
 
 	switch options.GetS(OPT_COMPLETION) {
 	case "bash":
-		fmt.Printf(bash.Generate(info, "rbinstall"))
+		fmt.Print(bash.Generate(info, "rbinstall"))
 	case "fish":
-		fmt.Printf(fish.Generate(info, "rbinstall"))
+		fmt.Print(fish.Generate(info, "rbinstall"))
 	case "zsh":
-		fmt.Printf(zsh.Generate(info, optMap, "rbinstall"))
+		fmt.Print(zsh.Generate(info, optMap, "rbinstall"))
 	default:
 		return 1
 	}

clone/clone.go

@@ -500,11 +500,11 @@ func printCompletion() int {
 
 	switch options.GetS(OPT_COMPLETION) {
 	case "bash":
-		fmt.Printf(bash.Generate(info, "rbinstall-clone"))
+		fmt.Print(bash.Generate(info, "rbinstall-clone"))
 	case "fish":
-		fmt.Printf(fish.Generate(info, "rbinstall-clone"))
+		fmt.Print(fish.Generate(info, "rbinstall-clone"))
 	case "zsh":
-		fmt.Printf(zsh.Generate(info, optMap, "rbinstall-clone"))
+		fmt.Print(zsh.Generate(info, optMap, "rbinstall-clone"))
 	default:
 		return 1
 	}

common/rbinstall.spec

@@ -121,6 +121,7 @@ rm -rf %{buildroot}
 * Tue Oct 17 2023 Anton Novojilov <[email protected]> - 3.1.2-0
 - [gen] Improved alias and eol info handling
 - [cli|gen|clone] Improve verbose version info
+- [cli|gen|clone] Code refactoring
 - Dependencies update
 
 * Tue Oct 03 2023 Anton Novojilov <[email protected]> - 3.1.1-0

gen/gen.go

@@ -269,7 +269,7 @@ func buildIndex(dataDir string) {
 		alreadyExist := false
 
 		filePath := path.Join(dataDir, fileInfo.OS, fileInfo.Arch, fileInfo.File)
-		fileName := strings.Replace(fileInfo.File, ".tzst", "", -1)
+		fileName := strutil.Exclude(fileInfo.File, ".tzst")
 		fileSize := fsutil.GetSize(filePath)
 		fileAdded, _ := fsutil.GetCTime(filePath)
 
@@ -554,11 +554,11 @@ func printCompletion() int {
 
 	switch options.GetS(OPT_COMPLETION) {
 	case "bash":
-		fmt.Printf(bash.Generate(info, "rbinstall-clone"))
+		fmt.Print(bash.Generate(info, "rbinstall-clone"))
 	case "fish":
-		fmt.Printf(fish.Generate(info, "rbinstall-clone"))
+		fmt.Print(fish.Generate(info, "rbinstall-clone"))
 	case "zsh":
-		fmt.Printf(zsh.Generate(info, optMap, "rbinstall-clone"))
+		fmt.Print(zsh.Generate(info, optMap, "rbinstall-clone"))
 	default:
 		return 1
 	}

index/index.go

@@ -75,8 +75,8 @@ type versionInfoSlice []*VersionInfo
 func (s versionInfoSlice) Len() int      { return len(s) }
 func (s versionInfoSlice) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
 func (s versionInfoSlice) Less(i, j int) bool {
-	iv := strings.Replace(s[i].Name, "-", ".", -1)
-	jv := strings.Replace(s[j].Name, "-", ".", -1)
+	iv := strings.ReplaceAll(s[i].Name, "-", ".")
+	jv := strings.ReplaceAll(s[j].Name, "-", ".")
 
 	return sortutil.VersionCompare(iv, jv)
 }
@@ -86,7 +86,7 @@ func (s versionInfoSlice) Less(i, j int) bool {
 // NewIndex return pointer to new index struct
 func NewIndex() *Index {
 	return &Index{
-		UUID: uuid.GenUUID(),
+		UUID: uuid.UUID4().String(),
 		Meta: &Metadata{},
 		Data: make(map[string]DistData),
 	}

support/support.go

@@ -118,7 +118,7 @@ func getHashColorBullet(v string) string {
 
 // printInfo formats and prints info record
 func printInfo(size int, name, value string) {
-	name = name + ":"
+	name += ":"
 	size++
 
 	if value == "" {

support/support_linux.go

@@ -42,11 +42,9 @@ func showOSInfo() {
 
 	if err != nil {
 		return
-	} else {
-		if osInfo == nil {
-			fmtutil.Separator(false, "SYSTEM INFO")
-			printInfo(12, "Name", systemInfo.OS)
-		}
+	} else if osInfo == nil {
+		fmtutil.Separator(false, "SYSTEM INFO")
+		printInfo(12, "Name", systemInfo.OS)
 	}
 
 	printInfo(12, "Arch", systemInfo.Arch)