Changeset 82d0965


Ignore:
Timestamp:
01/22/2021 07:05:53 PM (9 months ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, ml-11.0, multilib, trunk, xry111/git-transition, xry111/glibc-2.34, xry111/tester-nohack, xry111/usr-move
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:
1 edited

Legend:

Unmodified
Added
Removed
  • lfs-latest.php

    ra35db3f r82d0965  
    7070function http_get_file( $url )
    7171{
    72   if ( ! preg_match( "/sourceforge/", $url ) )
     72  if ( ! preg_match( "/sourceforge/", $url ) &&
     73       ! preg_match( "/psmisc/",      $url ) )
    7374  {
    7475    exec( "curl --location --silent --max-time 30 $url", $dir );
     
    106107  global $regex;
    107108
    108 //if ( $package != "zstd" ) return 0; // Debug
     109if ( $package != "psmisc" ) return 0; // Debug
    109110
    110111if ( $package == "bc"         ) $dirpath = "https://github.com/gavinhoward/bc/releases";
     
    123124if ( $package == "mpfr"       ) $dirpath = "http://mpfr.loria.fr/mpfr-current";
    124125if ( $package == "ninja"      ) $dirpath = "https://github.com/ninja-build/ninja/releases";
    125 //if ( $package == "procps-ng"  ) $dirpath = "http://sourceforge.net/projects/procps-ng/files";
    126126if ( $package == "procps-ng"  ) $dirpath = "https://gitlab.com/procps-ng/procps/-/tags";
    127 //if ( $package == "psmisc"     ) $dirpath = "http://sourceforge.net/projects/$package/files";
    128127if ( $package == "psmisc"     ) $dirpath = "https://gitlab.com/psmisc/psmisc/-/tags";
    129128if ( $package == "Python"     ) $dirpath = "https://www.python.org/downloads/source/";
     
    282281
    283282  if ( $package == "procps-ng" )
    284      return find_max( $lines, "/v\d/", "/^.*v([\d\.]+).*$/" );
     283     return find_max( $lines, "/v\d/", "/^.*v([\d\.]+) .*$/" );
    285284
    286285  if ( $package == "psmisc" )
    287      return find_max( $lines, "/^v/", "/^v([\d\.]+).*$/" );
     286     return find_max( $lines, "/v\d/", "/^.*v([\d\.]+) .*$/" );
    288287
    289288  if ( $package == "grub" )
Note: See TracChangeset for help on using the changeset viewer.