use lib, update regex (#98)

* better regex for librespeed * use new lib script
arevindh · Apr 30, 2024 · c24fb4b · c24fb4b
1 parent 59a782a
commit c24fb4b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/api_speedtest.php b/api_speedtest.php
@@ -346,7 +346,7 @@ function getStatusCmd()
 function whichSpeedtest()
 {
     if (file_exists('/usr/bin/speedtest')) {
-        $officialInstalled = speedtestExecute('SKIP_MOD=true ; . /opt/pihole/speedtestmod/mod.sh ; notInstalled speedtest && echo "false" || echo "true"')['data'];
+        $officialInstalled = speedtestExecute('. /opt/pihole/speedtestmod/lib.sh ; notInstalled speedtest && echo "false" || echo "true"')['data'];
 
         if ($officialInstalled === 'true') {
             return 'official';

diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js
@@ -617,7 +617,7 @@ $(function () {
             let lastRunText = "Latest run is unavailable";
             if (lastRun) {
               lastRunText = `\nLatest run:\n${lastRun
-                .replaceAll(/["{},]/g, "")
+                .replaceAll(/[[\]"{},]/g, "")
                 .replaceAll(/\n\s*\n/g, "\n")
                 .replaceAll(/^\n+|\s+$/g, "")}`;
             }