Merge: Matomo: various fixes (#380924)

This commit is contained in:
Maximilian Bosch
2025-02-19 18:39:01 +01:00
committed by GitHub
2 changed files with 4 additions and 4 deletions
@@ -1,8 +1,8 @@
diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php
index 74de2535b4..bc172ad0eb 100644
index 97c7e74460..d70e83d155 100644
--- a/plugins/Installation/FormDatabaseSetup.php
+++ b/plugins/Installation/FormDatabaseSetup.php
@@ -82,7 +82,7 @@ class FormDatabaseSetup extends QuickForm2
@@ -96,7 +96,7 @@ class FormDatabaseSetup extends QuickForm2
$defaults = array(
@@ -10,4 +10,4 @@ index 74de2535b4..bc172ad0eb 100644
+ 'host' => 'localhost',
'type' => $defaultDatabaseType,
'tables_prefix' => 'matomo_',
);
'schema' => 'Mysql',
+1 -1
View File
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
for f in $filesToFix; do
if [ -f "$f" ]; then
length="$(wc -c "$f" | cut -d' ' -f1)"
hash="$(md5sum "$f" | cut -d' ' -f1)"
hash="$(sha256sum "$f" | cut -d' ' -f1)"
sed -i "s:\\(\"$f\"[^(]*(\\).*:\\1\"$length\", \"$hash\"),:g" config/manifest.inc.php
else
echo "INFO(files-to-fix): $f does not exist in this version"