builder-flatpak-utils: Normalize the single trailing slash in pattern

Fixes: #476

Author: bbhtt

src/builder-flatpak-utils.c

@@ -147,6 +147,15 @@ flatpak_path_match_prefix (const char *pattern,
   while (*string == '/')
     string++;
 
+  {
+    size_t len = strlen (pattern);
+    if (len > 1 && pattern[len - 1] == '/')
+      {
+        g_autofree char *normalized = g_strndup (pattern, len - 1);
+        return flatpak_path_match_prefix (normalized, string);
+      }
+  }
+
   while (TRUE)
     {
       switch (c = *pattern++)

tests/test-builder-cleanup.sh

@@ -23,7 +23,7 @@ set -euo pipefail
 
 skip_without_fuse
 
-echo "1..7"
+echo "1..8"
 
 setup_repo
 install_repo
@@ -256,3 +256,27 @@ assert_not_has_file appdir/files/a1/file.txt
 assert_has_file appdir/files/a/b/file.txt
 
 echo "ok '?' does not match '/'"
+
+cat > test-cleanup-trailing-slash.json <<'EOF'
+{
+  "app-id": "org.test.CleanupTrailingSlash",
+  "runtime": "org.test.Platform",
+  "sdk": "org.test.Sdk",
+  "cleanup": ["/share/doc/"],
+  "modules": [{
+    "name": "test",
+    "buildsystem": "simple",
+    "build-commands": [
+      "mkdir -p /app/share/doc",
+      "echo x > /app/share/doc/file"
+    ]
+  }]
+}
+EOF
+
+run_build test-cleanup-trailing-slash.json
+
+assert_not_has_file appdir/files/share/doc/file
+assert_not_has_dir  appdir/files/share/doc
+
+echo "ok trailing slash works"