Merge pull request #9665 from kobergj/AssimilateTrashCommand

Fix trash command
owncloud · Jul 22, 2024 · 47412e7 · 47412e7
2 parents 9059045 + be6b3a0
commit 47412e7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/changelog/unreleased/fix-trash-command.md b/changelog/unreleased/fix-trash-command.md
@@ -0,0 +1,5 @@
+Enhancement: Fix trash command
+
+The `ocis trash purge-empty-dirs` command should work on any storage provider, not just `storage/users`.
+
+https://github.com/owncloud/ocis/pull/9665
diff --git a/ocis/pkg/trash/trash.go b/ocis/pkg/trash/trash.go
@@ -9,7 +9,7 @@ import (
 
 const (
 	// _trashGlobPattern is the glob pattern to find all trash items
-	_trashGlobPattern = "storage/users/spaces/*/*/trash/*/*/*/*"
+	_trashGlobPattern = "spaces/*/*/trash/*/*/*/*"
 )
 
 // PurgeTrashEmptyPaths purges empty paths in the trash