From 8b90f4b2b234ab5ca0642c58b216d88d1b4d43be Mon Sep 17 00:00:00 2001 From: AlteredCoder <64792091+AlteredCoder@users.noreply.github.com> Date: Mon, 14 Feb 2022 16:51:06 +0100 Subject: [PATCH] Upgrade download datafiles if doesn't exist (#1254) --- cmd/crowdsec-cli/utils.go | 7 ++++--- pkg/cwhub/download.go | 8 +++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cmd/crowdsec-cli/utils.go b/cmd/crowdsec-cli/utils.go index 666deb4f7..5e2ab9f36 100644 --- a/cmd/crowdsec-cli/utils.go +++ b/cmd/crowdsec-cli/utils.go @@ -259,10 +259,11 @@ func UpgradeConfig(itemType string, name string, force bool) { if v.UpToDate { log.Infof("%s : up-to-date", v.Name) + if err = cwhub.DownloadDataIfNeeded(csConfig.Hub, v, force); err != nil { + log.Fatalf("%s : download failed : %v", v.Name, err) + } + if !force { - if err = cwhub.DownloadDataIfNeeded(csConfig.Hub, v, false); err != nil { - log.Fatalf("%s : download failed : %v", v.Name, err) - } continue } } diff --git a/pkg/cwhub/download.go b/pkg/cwhub/download.go index 57879e2ca..ba3324bb1 100644 --- a/pkg/cwhub/download.go +++ b/pkg/cwhub/download.go @@ -253,11 +253,9 @@ func downloadData(dataFolder string, force bool, reader io.Reader) error { } download := false - if !force { - for _, dataS := range data.Data { - if _, err := os.Stat(path.Join(dataFolder, dataS.DestPath)); os.IsNotExist(err) { - download = true - } + for _, dataS := range data.Data { + if _, err := os.Stat(path.Join(dataFolder, dataS.DestPath)); os.IsNotExist(err) { + download = true } } if download || force {