From a7db907816c4296914e49bb82bca34ccb458428e Mon Sep 17 00:00:00 2001 From: George Boudreau Date: Thu, 22 Jun 2006 15:05:49 +0000 Subject: [PATCH] CLFS changed definition of VERSION.. added fix --- common/common-functions | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/common/common-functions b/common/common-functions index 48a9797..e92edf7 100644 --- a/common/common-functions +++ b/common/common-functions @@ -572,12 +572,20 @@ get_book() { # # Set the canonical book version cd $JHALFSDIR VERSION=`grep "ENTITY version " $BOOK/general.ent | sed 's@@@'` + # Another work-around, clfs book has a x.x.x-date versioning system + if [ "$PROGNAME" = "clfs" ]; then + VERSION=${VERSION##*-} + fi get_sources else echo -ne "done\n" # Set the canonical book version cd $JHALFSDIR VERSION=`grep "ENTITY version " $BOOK/general.ent | sed 's@@@'` + # Another work-around, clfs book has a x.x.x-date versioning system + if [ "$PROGNAME" = "clfs" ]; then + VERSION=${VERSION##*-} + fi extract_commands fi else @@ -589,6 +597,10 @@ get_book() { # # Set the canonical book version cd $JHALFSDIR VERSION=`grep "ENTITY version " $BOOK/general.ent | sed 's@@@'` + # Another work-around, clfs book has a x.x.x-date versioning system + if [ "$PROGNAME" = "clfs" ]; then + VERSION=${VERSION##*-} + fi extract_commands fi else @@ -596,6 +608,10 @@ get_book() { # # Set the canonical book version cd $JHALFSDIR VERSION=`grep "ENTITY version " $BOOK/general.ent | sed 's@@@'` + # Another work-around, clfs book has a x.x.x-date versioning system + if [ "$PROGNAME" = "clfs" ]; then + VERSION=${VERSION##*-} + fi extract_commands fi }