Removed duplicated VERSION declarations.
This commit is contained in:
parent
a03a4aac39
commit
3d1b5421d3
2 changed files with 5 additions and 21 deletions
|
@ -579,13 +579,6 @@ get_book() { #
|
||||||
get_sources
|
get_sources
|
||||||
else
|
else
|
||||||
echo -ne "done\n"
|
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
|
extract_commands
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
@ -594,24 +587,10 @@ get_book() { #
|
||||||
svn co $SVN/${svn_root}/trunk/BOOK ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1 ;;
|
svn co $SVN/${svn_root}/trunk/BOOK ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1 ;;
|
||||||
esac
|
esac
|
||||||
echo -ne "done\n"
|
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
|
extract_commands
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo -ne "Using $BOOK as book's sources ...\n"
|
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
|
extract_commands
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -626,6 +605,10 @@ extract_commands() { #
|
||||||
|
|
||||||
cd $JHALFSDIR
|
cd $JHALFSDIR
|
||||||
VERSION=`grep "ENTITY version " $BOOK/general.ent | sed 's@<!ENTITY version "@@;s@">@@'`
|
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
|
# Start clean
|
||||||
if [ -d ${PROGNAME}-commands ]; then
|
if [ -d ${PROGNAME}-commands ]; then
|
||||||
|
|
|
@ -507,6 +507,7 @@ if [[ "$PWD" != "$JHALFSDIR" ]]; then
|
||||||
fi
|
fi
|
||||||
#
|
#
|
||||||
[[ "$GETPKG" = "1" ]] && cp $COMMON_DIR/urls.xsl $JHALFSDIR/
|
[[ "$GETPKG" = "1" ]] && cp $COMMON_DIR/urls.xsl $JHALFSDIR/
|
||||||
|
#
|
||||||
cp $COMMON_DIR/packages.xsl $JHALFSDIR/
|
cp $COMMON_DIR/packages.xsl $JHALFSDIR/
|
||||||
#
|
#
|
||||||
sed 's,FAKEDIR,'$BOOK',' $PACKAGE_DIR/$XSL > $JHALFSDIR/${XSL}
|
sed 's,FAKEDIR,'$BOOK',' $PACKAGE_DIR/$XSL > $JHALFSDIR/${XSL}
|
||||||
|
|
Reference in a new issue