Skip to content

Commit

Permalink
fix: [#371] Add YML extension support for stack and pkgmanagers
Browse files Browse the repository at this point in the history
Updated the util function name to SelectYamlFile.
  • Loading branch information
deepu9 authored and mirkobrombin committed Jul 13, 2024
1 parent 4965058 commit c471396
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions core/pkgManager.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ func NewPkgManager(name string, needSudo bool, autoRemove, clean, install, list,

// LoadPkgManager loads a package manager from the specified path.
func LoadPkgManager(name string) (*PkgManager, error) {
userPkgFile := ChooseYamlFile(apx.Cnf.UserPkgManagersPath, name)
userPkgFile := SelectYamlFile(apx.Cnf.UserPkgManagersPath, name)
pkgManager, err := loadPkgManagerFromPath(userPkgFile)
if err != nil {
pkgFile := ChooseYamlFile(apx.Cnf.PkgManagersPath, name)
pkgFile := SelectYamlFile(apx.Cnf.PkgManagersPath, name)
pkgManager, err = loadPkgManagerFromPath(pkgFile)
}
return pkgManager, err
Expand Down Expand Up @@ -108,7 +108,7 @@ func (pkgManager *PkgManager) Save() error {
return err
}

filePath := ChooseYamlFile(apx.Cnf.UserPkgManagersPath, pkgManager.Name)
filePath := SelectYamlFile(apx.Cnf.UserPkgManagersPath, pkgManager.Name)
err = os.WriteFile(filePath, data, 0644)
return err
}
Expand All @@ -119,7 +119,7 @@ func (pkgManager *PkgManager) Remove() error {
return errors.New("cannot remove built-in package manager")
}

filePath := ChooseYamlFile(apx.Cnf.UserPkgManagersPath, pkgManager.Name)
filePath := SelectYamlFile(apx.Cnf.UserPkgManagersPath, pkgManager.Name)
err := os.Remove(filePath)
return err
}
Expand Down Expand Up @@ -231,7 +231,7 @@ func (pkgManager *PkgManager) Export(path string) error {
}
}

filePath := ChooseYamlFile(path, pkgManager.Name)
filePath := SelectYamlFile(path, pkgManager.Name)
data, err := yaml.Marshal(pkgManager)
if err != nil {
return err
Expand Down
10 changes: 5 additions & 5 deletions core/stack.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ func NewStack(name, base string, packages []string, pkgManager string, builtIn b

// LoadStack loads a stack from the specified path.
func LoadStack(name string) (*Stack, error) {
usrStackFile := ChooseYamlFile(apx.Cnf.UserStacksPath, name)
usrStackFile := SelectYamlFile(apx.Cnf.UserStacksPath, name)
stack, err := LoadStackFromPath(usrStackFile)
if err != nil {
stackFile := ChooseYamlFile(apx.Cnf.StacksPath, name)
stackFile := SelectYamlFile(apx.Cnf.StacksPath, name)
stack, err = LoadStackFromPath(stackFile)
}
return stack, err
Expand Down Expand Up @@ -82,7 +82,7 @@ func (stack *Stack) Save() error {
return err
}

filePath := ChooseYamlFile(apx.Cnf.UserStacksPath, stack.Name)
filePath := SelectYamlFile(apx.Cnf.UserStacksPath, stack.Name)
err = os.WriteFile(filePath, data, 0644)
return err
}
Expand All @@ -103,7 +103,7 @@ func (stack *Stack) Remove() error {
return errors.New("cannot remove built-in stack")
}

filePath := ChooseYamlFile(apx.Cnf.UserStacksPath, stack.Name)
filePath := SelectYamlFile(apx.Cnf.UserStacksPath, stack.Name)
err := os.Remove(filePath)
return err
}
Expand All @@ -117,7 +117,7 @@ func (stack *Stack) Export(path string) error {
}
}

filePath := ChooseYamlFile(path, stack.Name)
filePath := SelectYamlFile(path, stack.Name)
data, err := yaml.Marshal(stack)
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion core/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func CopyFile(src, dst string) error {
return nil
}

func ChooseYamlFile(basePath string, name string) string {
func SelectYamlFile(basePath string, name string) string {
const (
YML string = ".yml"
YAML string = ".yaml"
Expand Down

0 comments on commit c471396

Please sign in to comment.