fix getting version (#91)

arevindh · Mar 1, 2024 · e693f17 · e693f17
1 parent f69d459
commit e693f17
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/api_speedtest.php b/api_speedtest.php
@@ -341,15 +341,15 @@ function getStatusCmd()
 
 function whichSpeedtest()
 {
-    if (!file_exists('/usr/bin/speedtest')) {
-        return 'official';
-    }
-    $version = speedtestExecute('/usr/bin/speedtest --version')['data'];
-    if (strpos($version, 'LibreSpeed') !== false) {
-        return 'LibreSpeed';
-    } elseif (strpos($version, 'Python') !== false) {
-        return 'sivel\'s';
-    } else {
-        return 'official';
+    if (file_exists('/usr/bin/speedtest')) {
+        $version = speedtestExecute('/usr/bin/speedtest --version')['data'];
+        if (strpos($version, 'LibreSpeed') !== false) {
+            return 'LibreSpeed';
+        }
+        if (strpos($version, 'Python') !== false) {
+            return 'sivel\'s';
+        }
     }
+
+    return 'official';
 }
diff --git a/scripts/pi-hole/php/footer.php b/scripts/pi-hole/php/footer.php
@@ -88,7 +88,7 @@
                         <?php if ($web_update) { ?> &middot; <a class="lookatme" lookatme-text="Update available!" href="<?php echo $webUrl.'/latest'; ?>" rel="noopener" target="_blank">Update available!</a><?php } ?>
                     </li>
                     <li>
-                        <strong>Speedtest Mod</strong>
+                        <strong>Speedtest</strong>
                         <?php echo $speedtestVersionStr; ?>
                         <?php if ($speedtest_update) { ?> &middot; <a class="lookatme" lookatme-text="Update available!" href="<?php echo $speedtestUrl.'/latest'; ?>" rel="noopener" target="_blank">Update available!</a><?php } ?>
                     </li>
@@ -98,7 +98,9 @@
                     <?php if ($docker_update) { ?>
                         To install updates, <a href="https://github.com/pi-hole/docker-pi-hole#upgrading-persistence-and-customizations" rel="noopener" target="_blank">replace this old container with a fresh upgraded image</a>.
                     <?php } elseif ($core_update || $web_update || $FTL_update) { ?>
-                        To install updates, run <code><a href="https://docs.pi-hole.net/main/update/" rel="noopener" target="_blank">pihole -up</a></code>.
+                        To install updates, uninstall Speedtest Mod, run <code><a href="https://docs.pi-hole.net/main/update/" rel="noopener" target="_blank">pihole -up</a></code>, and reinstall Speedtest Mod. The Reinstall button in [ Settings > Speedtest ] can do this for you!
+                    <?php } elseif ($speedtest_update) { ?>
+                        To install updates, reinstall Speedtest Mod. The Reinstall button in [ Settings > Speedtest ] can do this for you!
                     <?php } ?>
                 </p>
             </div>

diff --git a/scripts/pi-hole/php/update_checker.php b/scripts/pi-hole/php/update_checker.php
@@ -116,8 +116,8 @@ function checkUpdate($currentVersion, $latestVersion)
 }
 
 // URLs for the links
-$coreUrl = 'https://github.com/pi-hole/pi-hole/releases';
-$webUrl = 'https://github.com/pi-hole/AdminLTE/releases';
+$coreUrl = 'https://github.com/arevindh/pi-hole/releases';
+$webUrl = 'https://github.com/arevindh/AdminLTE/releases';
 $ftlUrl = 'https://github.com/pi-hole/FTL/releases';
 $dockerUrl = 'https://github.com/pi-hole/docker-pi-hole/releases';
 $speedtestUrl = 'https://github.com/arevindh/pihole-speedtest/releases';