Skip to content

Commit

Permalink
[gen] Fix bug with searching base version
Browse files Browse the repository at this point in the history
  • Loading branch information
andyone committed Oct 2, 2023
1 parent 452418f commit c841cba
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
10 changes: 7 additions & 3 deletions common/rbinstall.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

Summary: Utility for installing prebuilt Ruby to rbenv
Name: rbinstall
Version: 3.1.0
Version: 3.1.1
Release: 0%{?dist}
Group: Applications/System
License: Apache License, Version 2.0
Expand Down Expand Up @@ -38,7 +38,7 @@ Utility for installing different prebuilt versions of Ruby to rbenv.
%package gen

Summary: Utility for generating RBInstall index
Version: 3.0.3
Version: 3.0.4
Release: 0%{?dist}
Group: Development/Tools

Expand All @@ -50,7 +50,7 @@ Utility for generating RBInstall index.
%package clone

Summary: Utility for cloning RBInstall repository
Version: 3.0.3
Version: 3.0.4
Release: 0%{?dist}
Group: Development/Tools

Expand Down Expand Up @@ -118,6 +118,10 @@ rm -rf %{buildroot}
################################################################################

%changelog
* Tue Oct 03 2023 Anton Novojilov <[email protected]> - 3.1.1-0
- [gen] Fixed bug with searching base version
- Dependencies update

* Fri Sep 01 2023 Anton Novojilov <[email protected]> - 3.1.0-0
- [cli] Added option -X/--reinstall-updated for updating rebuilt versions
- [cli] Fixed color disabling using -nc/--no-color option
Expand Down
8 changes: 5 additions & 3 deletions gen/gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import (
// App info
const (
APP = "RBInstall Gen"
VER = "3.0.3"
VER = "3.0.4"
DESC = "Utility for generating RBInstall index"
)

Expand Down Expand Up @@ -250,7 +250,7 @@ func buildIndex(dataDir string) {
fileList := fsutil.ListAllFiles(
dataDir, true,
fsutil.ListingFilter{
Perms: "FR",
Perms: "FRS",
MatchPatterns: []string{"*.tzst"},
})

Expand Down Expand Up @@ -367,8 +367,8 @@ func processFiles(files []string) []FileInfo {
result = append(result, FileInfo{
OS: fileInfoSlice[0],
Arch: fileInfoSlice[1],
Category: guessCategory(fileInfoSlice[2]),
File: fileInfoSlice[2],
Category: guessCategory(fileInfoSlice[2]),
})
}

Expand Down Expand Up @@ -500,6 +500,8 @@ func getVariationBaseName(name string) string {
func fmtVersionName(v string) string {
v = strings.ReplaceAll(v, ".tzst", "")
v = strings.ReplaceAll(v, "-p", ".")
v = strings.ReplaceAll(v, "-railsexpress", ".1")
v = strings.ReplaceAll(v, "-jemalloc", ".2")
return v
}

Expand Down

0 comments on commit c841cba

Please sign in to comment.