Merge pull request #1279 from flyingcircusio/PL-133012-matomo-remove-unexpected-files

matomo: remove unexpected files

Author: osnyx

changelog.d/20250219_193309_PL-133012-matomo-remove-unexpected-files_scriv.md

@@ -0,0 +1,17 @@
+<!--
+
+A new changelog entry.
+
+Delete placeholder items that do not apply. Empty sections will be removed
+automatically during release.
+
+Leave the XX.XX as is: this is a placeholder and will be automatically filled
+correctly during the release and helps when backporting over multiple platform
+branches.
+
+-->
+
+
+### NixOS XX.XX platform
+
+- matomo: improve cleanup of unwanted files after upgrading from matomo4 to matomo5 (PL-133012)

nixos/services/matomo/matomo-delete-unwanted-files.sh

@@ -191,9 +191,18 @@ files=(\
   "/var/lib/matomo/share/node_modules/angular-sanitize/README.md"\
   "/var/lib/matomo/share/node_modules/angular-sanitize/angular-sanitize.min.js"\
   "/var/lib/matomo/share/node_modules/angular-sanitize/index.js"\
+  "/var/lib/matomo/share/libs/Zend/Session/SaveHandler/DbTable.php"\
+  "/var/lib/matomo/share/libs/Zend/Session/SaveHandler/Exception.php"\
+  "/var/lib/matomo/share/libs/Zend/Session/SaveHandler/Interface.php"\
+  "/var/lib/matomo/share/plugins/CoreHome/javascripts/numberFormatter.js"\
+  "/var/lib/matomo/share/plugins/CoreHome/vue/src/getFormattedEvolution.ts"\
+  "/var/lib/matomo/share/plugins/Installation/FormDatabaseSetup.php.orig"\
+  "/var/lib/matomo/share/plugins/TagManager/stylesheets/gettingStarted.less"\
+  "/var/lib/matomo/share/plugins/TagManager/templates/gettingStarted.twig"\
+  "/var/lib/matomo/share/plugins/TagManager/templates/trackingHelp.twig"\
 )
 
-for file in "''${files[@]}";do
+for file in "${files[@]}";do
   if [ -f "$file" ]; then
     rm -v "$file"
   fi
@@ -214,7 +223,7 @@ directories=(\
   "/var/lib/matomo/share/vendor/symfony/monolog-bridge/Symfony"\
 )
 
-for dir in "''${directories[@]}";do
+for dir in "${directories[@]}";do
   if [ -d "$dir" ]; then
     rm -Rvf "$dir"
   fi