summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3b4aa3f)
raw | patch | inline | side by side (parent: 3b4aa3f)
author | Robert Swain <robert.swain@collabora.co.uk> | |
Wed, 24 Mar 2010 12:33:58 +0000 (13:33 +0100) | ||
committer | Robert Swain <robert.swain@collabora.co.uk> | |
Wed, 24 Mar 2010 12:33:58 +0000 (13:33 +0100) |
scripts/git-update.sh | patch | blob | history |
diff --git a/scripts/git-update.sh b/scripts/git-update.sh
index bb028d6ae32841ffad20ecee956f936564106144..0c53f967bf323b5321f086556f2610376c2c8b2f 100755 (executable)
--- a/scripts/git-update.sh
+++ b/scripts/git-update.sh
{
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
- then
- echo "$1: autoregen.sh [$tmp/$1-regen.log]" >> $ERROR_LOG
- cd ..
- return $ERROR_RETURN
- 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
+ if test -e autoregen.sh
then
- echo "$1: autogen.sh [$tmp/$1-gen.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: autogen.sh done"
fi
echo "+ $1: make"