CLFS changed definition of VERSION.. added fix
This commit is contained in:
parent
ddde18e6f2
commit
a7db907816
1 changed files with 16 additions and 0 deletions
|
@ -572,12 +572,20 @@ get_book() { #
|
|||
# Set the canonical book version
|
||||
cd $JHALFSDIR
|
||||
VERSION=`grep "ENTITY version " $BOOK/general.ent | sed 's@<!ENTITY version "@@;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@<!ENTITY version "@@;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@<!ENTITY version "@@;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@<!ENTITY version "@@;s@">@@'`
|
||||
# Another work-around, clfs book has a x.x.x-date versioning system
|
||||
if [ "$PROGNAME" = "clfs" ]; then
|
||||
VERSION=${VERSION##*-}
|
||||
fi
|
||||
extract_commands
|
||||
fi
|
||||
}
|
||||
|
|
Reference in a new issue