Merge: Matomo: various fixes (#380924)
This commit is contained in:
@@ -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',
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user