diff --git a/bootstrap b/bootstrap index bcfaad6d..36ebde9f 100755 --- a/bootstrap +++ b/bootstrap @@ -1,5 +1,5 @@ #!/bin/sh -e -# Run this script after a fresh git-clone to bring the source tree +# Run this script after a fresh git clone to bring the source tree # into a state where you can run configure. aclocal -I m4 autoconf diff --git a/src/scripts/nightly/nightlybuild.sh b/src/scripts/nightly/nightlybuild.sh index 482e7978..97aac3ca 100755 --- a/src/scripts/nightly/nightlybuild.sh +++ b/src/scripts/nightly/nightlybuild.sh @@ -112,7 +112,7 @@ then do sleep "`expr 5 + ${RETR}`" RETR="`expr 1 + ${RETR}`" - [ "${RETR}" -gt 5 ] && err "git-clone Timeout after ${RETR} retres." + [ "${RETR}" -gt 5 ] && err "git clone Timeout after ${RETR} retres." done cd empserver || err "Could not cd to ${BOXDIR}/${WORKDIR}/empserver." else @@ -175,8 +175,8 @@ then echo "" fi -git-add include/emptime.h src/lib/gen/emptime.c -git-pull +git add include/emptime.h src/lib/gen/emptime.c +git pull sh ./bootstrap ./configure --prefix ${BOXDIR}/${WORKDIR}/emp4 ${CONFIGURE_OPTIONS}