Changeset 82d0965

Timestamp:

01/22/2021 07:05:53 PM (3 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

8850677

Parents:

a35db3f

Message:

Fix currency for psmisc and procps-ng

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12100 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• lfs-latest.php (modified) (4 diffs)

lfs-latest.php

@@ -70 +70 @@
 function http_get_file( $url )
 {
-  if ( ! preg_match( "/sourceforge/", $url ) )
+  if ( ! preg_match( "/sourceforge/", $url ) &&
+       ! preg_match( "/psmisc/",      $url ) )
   {
     exec( "curl --location --silent --max-time 30 $url", $dir );
@@ -106 +107 @@
   global $regex;
 
-//if ( $package != "zstd" ) return 0; // Debug
+if ( $package != "psmisc" ) return 0; // Debug
 
 if ( $package == "bc"         ) $dirpath = "https://github.com/gavinhoward/bc/releases";
@@ -123 +124 @@
 if ( $package == "mpfr"       ) $dirpath = "http://mpfr.loria.fr/mpfr-current";
 if ( $package == "ninja"      ) $dirpath = "https://github.com/ninja-build/ninja/releases";
-//if ( $package == "procps-ng"  ) $dirpath = "http://sourceforge.net/projects/procps-ng/files";
 if ( $package == "procps-ng"  ) $dirpath = "https://gitlab.com/procps-ng/procps/-/tags";
-//if ( $package == "psmisc"     ) $dirpath = "http://sourceforge.net/projects/$package/files";
 if ( $package == "psmisc"     ) $dirpath = "https://gitlab.com/psmisc/psmisc/-/tags";
 if ( $package == "Python"     ) $dirpath = "https://www.python.org/downloads/source/";
@@ -282 +281 @@
 
   if ( $package == "procps-ng" )
-     return find_max( $lines, "/v\d/", "/^.*v([\d\.]+).*$/" );
+     return find_max( $lines, "/v\d/", "/^.*v([\d\.]+) .*$/" );
 
   if ( $package == "psmisc" )
-     return find_max( $lines, "/^v/", "/^v([\d\.]+).*$/" );
+     return find_max( $lines, "/v\d/", "/^.*v([\d\.]+) .*$/" );
 
   if ( $package == "grub" )