git-update: Fix and restructure logic

This commit is contained in:
Robert Swain 2010-03-24 13:33:58 +01:00
parent 3b4aa3f76a
commit fe7d80580c

View file

@ -63,29 +63,30 @@ build()
{
if test -d $1; then
cd $1
if test ! -e Makefile -a -e autoregen.sh
if test ! -e Makefile
then
echo "+ $1: autoregen.sh"
./autoregen.sh > "$tmp/$1-regen.log" 2>&1
if test $? -ne 0
if test -e autoregen.sh
then
echo "$1: autoregen.sh [$tmp/$1-regen.log]" >> $ERROR_LOG
cd ..
return $ERROR_RETURN
echo "+ $1: autoregen.sh"
./autoregen.sh > "$tmp/$1-regen.log" 2>&1
if test $? -ne 0
then
echo "$1: autoregen.sh [$tmp/$1-regen.log]" >> $ERROR_LOG
cd ..
return $ERROR_RETURN
fi
echo "+ $1: autoregen.sh done"
else
echo "+ $1: autogen.sh"
./autogen.sh > "$tmp/$1-gen.log" 2>&1
if test $? -ne 0
then
echo "$1: autogen.sh [$tmp/$1-gen.log]" >> $ERROR_LOG
cd ..
return $ERROR_RETURN
fi
echo "+ $1: autogen.sh done"
fi
echo "+ $1: autoregen.sh done"
fi
else if test ! -e Makefile
then
echo "+ $1: autogen.sh"
./autogen.sh > "$tmp/$1-gen.log" 2>&1
if test $? -ne 0
then
echo "$1: autogen.sh [$tmp/$1-gen.log]" >> $ERROR_LOG
cd ..
return $ERROR_RETURN
fi
echo "+ $1: autogen.sh done"
fi
echo "+ $1: make"