From 1489007c7c7ea2581f2facf03eca0a8251125b8e Mon Sep 17 00:00:00 2001 From: Daniele Rondina Date: Sun, 24 Dec 2023 18:58:44 +0100 Subject: [PATCH] managers: Rebranding Macaroni OS Package Manager To integrate the images shortly of Macaroni OS we align the name of the rebranded Package Manager. Signed-off-by: Daniele Rondina --- doc/reference/packages.md | 2 +- managers/{luet.go => anise.go} | 32 +++++++++++++++++--------------- managers/manager.go | 2 +- shared/definition.go | 2 +- 4 files changed, 20 insertions(+), 18 deletions(-) rename managers/{luet.go => anise.go} (64%) diff --git a/doc/reference/packages.md b/doc/reference/packages.md index 3274db69..ac342086 100644 --- a/doc/reference/packages.md +++ b/doc/reference/packages.md @@ -37,7 +37,7 @@ Valid package manager are: * `dnf` * `egoportage` (combination of `portage` and `ego`) * `equo` -* `luet` +* `anise` * `opkg` * `pacman` * `portage` diff --git a/managers/luet.go b/managers/anise.go similarity index 64% rename from managers/luet.go rename to managers/anise.go index 938b935f..63d16ad0 100644 --- a/managers/luet.go +++ b/managers/anise.go @@ -12,42 +12,44 @@ import ( "github.com/lxc/distrobuilder/shared" ) -type luet struct { +type anise struct { common } -func (m *luet) load() error { +func (m *anise) load() error { m.commands = managerCommands{ - clean: "luet", - install: "luet", - refresh: "luet", - remove: "luet", - update: "luet", + clean: "anise", + install: "anise", + refresh: "anise", + remove: "anise", + update: "anise", } m.flags = managerFlags{ global: []string{}, clean: []string{ - "cleanup", + "cleanup", "--purge-repos", }, install: []string{ - "install", + // Forcing always override of the protected + // files. Not needed on image creation. + "install", "--skip-config-protect", }, refresh: []string{ - "repo", "update", + "repo", "update", "--force", }, remove: []string{ - "uninstall", + "uninstall", "--skip-config-protect", }, update: []string{ - "upgrade", + "upgrade", "--sync-repos", "--skip-config-protect", }, } return nil } -func (m *luet) manageRepository(repoAction shared.DefinitionPackagesRepository) error { +func (m *anise) manageRepository(repoAction shared.DefinitionPackagesRepository) error { var targetFile string if repoAction.Name == "" { @@ -59,9 +61,9 @@ func (m *luet) manageRepository(repoAction shared.DefinitionPackagesRepository) } if strings.HasSuffix(repoAction.Name, ".yml") { - targetFile = filepath.Join("/etc/luet/repos.conf.d", repoAction.Name) + targetFile = filepath.Join("/etc/anise/repos.conf.d", repoAction.Name) } else { - targetFile = filepath.Join("/etc/luet/repos.conf.d", repoAction.Name+".yml") + targetFile = filepath.Join("/etc/anise/repos.conf.d", repoAction.Name+".yml") } if !incus.PathExists(filepath.Dir(targetFile)) { diff --git a/managers/manager.go b/managers/manager.go index 2a3ad5f9..82129f6e 100644 --- a/managers/manager.go +++ b/managers/manager.go @@ -65,7 +65,7 @@ var managers = map[string]func() manager{ "dnf": func() manager { return &dnf{} }, "egoportage": func() manager { return &egoportage{} }, "equo": func() manager { return &equo{} }, - "luet": func() manager { return &luet{} }, + "anise": func() manager { return &anise{} }, "opkg": func() manager { return &opkg{} }, "pacman": func() manager { return &pacman{} }, "portage": func() manager { return &portage{} }, diff --git a/shared/definition.go b/shared/definition.go index 1f96d2da..4eaea362 100644 --- a/shared/definition.go +++ b/shared/definition.go @@ -403,7 +403,7 @@ func (d *Definition) Validate() error { "equo", "xbps", "zypper", - "luet", + "anise", "slackpkg", }