fix: remove whole directory on sbom-removal

close #8 Signed-off-by: Christian Kotzbauer <git@ckotzbauer.de>
ckotzbauer · Jan 21, 2022 · 891dfc7 · 891dfc7
1 parent 8199174
commit 891dfc7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/internal/daemon/daemon.go b/internal/daemon/daemon.go
@@ -109,7 +109,8 @@ func deleteObsoleteFiles(workPath string, ignoreDirs, processedSbomFiles []strin
 
 			if !found {
 				rel, _ := filepath.Rel(workPath, p)
-				gitAccount.RemoveFile(workPath, rel)
+				dir := filepath.Dir(rel)
+				gitAccount.Remove(workPath, dir)
 				if err != nil {
 					logrus.WithError(err).Errorf("File could not be deleted %s", p)
 				} else {

diff --git a/internal/git/git.go b/internal/git/git.go
@@ -128,7 +128,7 @@ func (g *GitAccount) CommitAll(path, message string) {
 	g.commitAndPush(w, r, message)
 }
 
-func (g *GitAccount) RemoveFile(workTree, path string) {
+func (g *GitAccount) Remove(workTree, path string) {
 	r, w := g.openExistingRepo(workTree)
 
 	if r == nil && w == nil {