Author: bdubbs
Date: Thu Jan 11 13:41:11 2018
New Revision: 19665
Log:
Scriot updates for Chapters 12 and 13
Modified:
trunk/scripts/blfs-chapter12.php
trunk/scripts/blfs-chapter13.php
Modified: trunk/scripts/blfs-chapter12.php
==============================================================================
--- trunk/scripts/blfs-chapter12.php Thu Jan 11 13:11:56 2018 (r19664)
+++ trunk/scripts/blfs-chapter12.php Thu Jan 11 13:41:11 2018 (r19665)
@@ -12,7 +12,6 @@
$renames[ 'udisks1' ] = 'udisks2';
$renames[ 'sg' ] = 'sg3_utils';
$renames[ 'unrarsrc' ] = 'unrar';
-//$renames[ 'p7zip_' ] = 'p7zip';
$ignores = array();
$ignores[ 'colord1' ] = "";
@@ -20,12 +19,9 @@
//$current="sysstat";
$regex = array();
-$regex[ 'acpid' ] = "/^.*Download acpid-(\d[\d\.]+\d).tar.*$/";
$regex[ 'fcron' ] = "/^.*Stable release fcron (\d[\d\.]+\d)*$/";
-$regex[ 'hdparm' ] = "/^.*Download hdparm-(\d[\d\.]+\d).tar.*$/";
$regex[ 'ibus' ] = "/^.*ibus-(\d[\d\.]+\d).tar.*$/";
$regex[ 'strigi' ] = "/^(\d[\d\.]+\d) .*$/";
-//$regex[ 'sysstat' ] = "/^.*sysstat-(\d[\d\.]+\d).tar.*$/";
$regex[ 'systemd' ] = "/^.*v(\d[\d\.]+\d).*$/";
$sf = 'sourceforge.net';
Modified: trunk/scripts/blfs-chapter13.php
==============================================================================
--- trunk/scripts/blfs-chapter13.php Thu Jan 11 13:11:56 2018 (r19664)
+++ trunk/scripts/blfs-chapter13.php Thu Jan 11 13:41:11 2018 (r19665)
@@ -13,7 +13,6 @@
$renames[ 'Python1' ] = 'python3';
$renames[ 'pygobject' ] = 'pygobject2';
$renames[ 'pygobject1' ] = 'pygobject3';
-//$renames[ 'v' ] = 'ninja';
$ignores = array();
$ignores[ 'cfe' ] = '';
@@ -37,11 +36,7 @@
$regex = array();
$regex[ 'check' ] = "/^.*Check (\d[\d\.]+\d).*$/";
-$regex[ 'docutils'] = "/^.*Download docutils-(\d[\d\.]+\d).tar.*$/";
-$regex[ 'expect' ] = "/^.*Download expect(\d[\d\.]+\d).tar.*$/";
$regex[ 'junit4' ] = "/^\h*(\d[\d\.]+)\h*$/";
-$regex[ 'scons' ] = "/^.*Download scons-(\d[\d\.]+\d).*$/";
-$regex[ 'tcl' ] = "/^.*Download tcl(\d[\d\.]+\d).*$/";
$regex[ 'Python' ] = "/^.*Latest Python 2.*Python (2[\d\.]+\d).*$/";
$regex[ 'Python1' ] = "/^.*Latest Python 3.*Python (3[\d\.]+\d).*$/";
$regex[ 'Mako' ] = "/^.*version is (\d[\d\.]+\d).*$/";
@@ -375,18 +370,6 @@
'replace' => "https://pypi.python.org/pypi/six"; ),
);
-/*
- // Skip minor versions in the 90s (most of the time)
- list( $major, $minor, $rest ) = explode( ".", $slice . ".0.0" );
- if ( $minor >= 90 &&
- $book_index != "librep" &&
- $book_index != "Glib" &&
- $book_index != "Business-ISSN" &&
- $book_index != "XML-LibXML-Simple" &&
- $book_index != "XML-LibXSLT" &&
- $book_index != "elfutils" ) continue;
-*/
-
function get_packages( $package, $dirpath )
{
global $regex;
@@ -560,6 +543,12 @@
if ( $package == "scour" )
return find_max( $lines, "/v/", "/^.*v(\d[\d\.]*\d).*$/" );
+ if ( $package == "expect" )
+ return find_max( $lines, "/expect/", "/^.*expect(\d[\d\.]*\d).tar.*$/" );
+
+ if ( $package == "tcl" )
+ return find_max( $lines, "/tcl/", "/^.*tcl(\d[\d\.]*\d)-src.*$/" );
+
if ( $package == "rustc" )
{
$max = find_max( $lines, "/release/", "/^.* (\d[\d\.]+\d) release.*$/" );
@@ -572,12 +561,6 @@
if ( $book_index == "nasm" )
return find_max( $lines, '/^\d/', '/^(\d[\d\.]+\d)\/.*$/' );
-# if ( $book_index == "python" || $book_index == "python1" ) // python docs
-# {
-# return find_max( $lines, "/python-\d/",
-# "/^python-(\d[\d\.]*\d)-docs.*$/" );
-# }
-
if ( $book_index == "cmake" )
{
$max = find_max( $lines, "/$package/",
@@ -604,6 +587,9 @@
if ( $book_index == "Text-CSV" )
return find_max( $lines, "/$package/", "/^.*$package-(\d[\d\.]+\d).*$/" );
+ if ( $book_index == "scons" )
+ return find_max( $lines, "/$package/",
"/^.*$package-(\d[\d\.]+\d).zip.*$/" );
+
if ( $book_index == "tk" )
{
$dir = find_max( $lines, '/8\./', '/^.*(8\.[\d\.]+\d).*$/' );
@@ -613,7 +599,6 @@
// Most packages are in the form $package-n.n.n
// Occasionally there are dashes (e.g. 201-1)
-
$max = find_max( $lines, "/$package/", "/^.*$package-([\d\.]+\d).tar.*$/" );
return $max;
}
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
