Changeset 19ff1da

Timestamp:

07/03/2023 09:22:17 AM (12 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

12.0, 12.0-rc1, 12.1, 12.1-rc1, multilib, renodr/libudev-from-systemd, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/update-glibc

Children:

bf7d328

Parents:

48834cf

Message:

currency: Refactor http_get_file to avoid duplicating preg_match

Check special cases and return early.

File:

• lfs-latest-git.php (modified) (2 diffs)

lfs-latest-git.php

@@ -70 +70 @@
 function http_get_file( $url )
 {
-  if ( ! preg_match( "/sourceforge/", $url ) &&
-       ! preg_match( "/mpfr/",        $url ) &&
-       ! preg_match( "/psmisc/",      $url ) )
-  {
-    exec( "curl --location --silent --max-time 30 $url", $dir );
-
-    $s   = implode( "\n", $dir );
-    $dir = strip_tags( $s );
-    return explode( "\n", $dir );
-  }
-  else if ( preg_match( "/mpfr/", $url ) )
+  if ( preg_match( "/mpfr/", $url ) )
   {
     # There seems to be a problem with the mpfs certificate
@@ -88 +78 @@
     return explode( "\n", $dir );
   }
-  else
+
+  if ( preg_match( "/sourceforge/", $url ) ||
+       preg_match( "/psmisc/",      $url ) )
   {
     exec( "lynx -dump $url 2>/dev/null", $lines );
     return $lines;
   }
+
+  exec( "curl --location --silent --max-time 30 $url", $dir );
+
+  $s   = implode( "\n", $dir );
+  $dir = strip_tags( $s );
+  return explode( "\n", $dir );
 }