zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed duplicated VERSION declarations.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2006-06-23 17:35:28 +00:00
parent a03a4aac39
commit 3d1b5421d3
2 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
common/common-functions
View file

@ -579,13 +579,6 @@ get_book() { #
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
@ -594,24 +587,10 @@ get_book() { #
svn co $SVN/${svn_root}/trunk/BOOK ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1 ;;
esac
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
echo -ne "Using $BOOK as book's sources ...\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
}
@ -626,6 +605,10 @@ extract_commands() { #
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
# Start clean
if [ -d ${PROGNAME}-commands ]; then

1
master.sh
View file

@ -507,6 +507,7 @@ if [[ "$PWD" != "$JHALFSDIR" ]]; then
fi
#
[[ "$GETPKG" = "1" ]] && cp $COMMON_DIR/urls.xsl $JHALFSDIR/
#
cp $COMMON_DIR/packages.xsl $JHALFSDIR/
#
sed 's,FAKEDIR,'$BOOK',' $PACKAGE_DIR/$XSL > $JHALFSDIR/${XSL}