buildDocExports : fix bugs

This commit is contained in:
Benjamin Renard 2009-11-13 18:47:28 +01:00
parent d67235123c
commit c273f59bd1
2 changed files with 13 additions and 10 deletions

View file

@ -38,7 +38,7 @@ then
cp -f $DOC_DIR/exports/pdf/LdapSaisie.pdf $EXPORT_DOC_DIR/LdapSaisie.pdf cp -f $DOC_DIR/exports/pdf/LdapSaisie.pdf $EXPORT_DOC_DIR/LdapSaisie.pdf
if [ $? -ne 0 ] if [ $? -ne 0 ]
then then
echo Error echo -e "\n-> Error"
ERROR=1 ERROR=1
else else
echo Ok echo Ok
@ -97,12 +97,12 @@ then
cd $DOC_DIR cd $DOC_DIR
for i in `find -type d|grep -v 'export'` for i in `find -type d|grep -v 'export'`
do do
mkdir -p $TMP_DIR/$DOCBOOK/$i mkdir -p $TMP_DIR/$DOCBOOK/$i
done done
for i in `find -type f|grep -v '(Makefile|^./export)'` for i in `find -type f|egrep -v '(Makefile|^./export)'`
do do
cp $i $TMP_DIR/$DOCBOOK/$i cp $i $TMP_DIR/$DOCBOOK/$i
done done
echo "done. Build archive and move it later ..." echo "done. Build archive and move it later ..."
@ -114,22 +114,23 @@ for i in $ALL_IN_ONE $ONLINE $DOCBOOK
do do
echo -e "\t$i : " echo -e "\t$i : "
echo -en "\t\t+ Archive : " echo -en "\t\t+ Archive : "
tar -cjf LdapSaisie--Doc--$i.tar.bz2 $i && mv LdapSaisie--Doc--$i.tar.bz2 $EXPORT_DOC_DIR/ tar -cjf LdapSaisie--Doc--$i.tar.bz2 $i && mv LdapSaisie--Doc--$i.tar.bz2 $EXPORT_DOC_DIR/
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
echo Ok echo Ok
else else
echo Erreur echo -e "\n-> Error"
ERROR=1 ERROR=1
fi fi
echo -en "\t\t+ Web dir : " echo -en "\t\t+ Web dir : "
rm -fr $EXPORT_DOC_DIR/$i/* && cp -fr $i/* $EXPORT_DOC_DIR/$i/ && rm -fr $i [ ! -d "$EXPORT_DOC_DIR/$i" ] && echo "you must create export $i directory manualy before run this script. (path : $EXPORT_DOC_DIR/$i)" && continue
rm -fr $EXPORT_DOC_DIR/$i/* && cp -fr $i/* $EXPORT_DOC_DIR/$i/ && rm -fr $i
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
echo Ok echo Ok
else else
echo Erreur echo -e "\n-> Error"
ERROR=1 ERROR=1
fi fi
done done
@ -144,3 +145,5 @@ then
fi fi
rm -fr $TMP_DIR rm -fr $TMP_DIR
exit $ERROR

View file

@ -33,10 +33,10 @@ ONLINE=online
DOCBOOK=docbook DOCBOOK=docbook
# The CSS file to use in export # The CSS file to use in export
CSS=$DOC_DIR/styles/LS.css CSS=$ROOT_DIR/doc/styles/LS.css
# The image doc directory # The image doc directory
IMAGES=$DOC_DIR/images IMAGES=$ROOT_DIR/doc/images
# The name of last update file # The name of last update file
LAST_UPDATE_FILE=$EXPORT_DIR/last_update.txt LAST_UPDATE_FILE=$EXPORT_DIR/last_update.txt