diff options
author | Michael Adam <obnox@samba.org> | 2009-01-21 15:10:10 +0100 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2009-07-30 09:22:10 +0200 |
commit | a79fdce48072ae073375ac2b988e6c4f19be2dff (patch) | |
tree | d958aa87fe62ee08b8f2e7a10d7ad879ae8f2995 | |
parent | 80cbbb5bd696f54b3af6e61b233ec0ebaaae63c4 (diff) | |
download | samba-a79fdce48072ae073375ac2b988e6c4f19be2dff.tar.gz |
build-docs: cleanup exit of the script
exit in the directory where it was called using pushd/popd.
Michael
(cherry picked from commit b319549f129b1c79afc9bfd4a84f2730b96d69a3)
Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 84433b32a9339662ddad9443b90beafdcd8a2044)
-rwxr-xr-x | release-scripts/build-docs | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/release-scripts/build-docs b/release-scripts/build-docs index bde87f49bda..5da641ac691 100755 --- a/release-scripts/build-docs +++ b/release-scripts/build-docs @@ -1,8 +1,14 @@ #!/bin/sh +_exit() { + echo $@ + popd + exit 1 +} + DOCSRCDIR=`dirname $0`/../docs-xml -cd $DOCSRCDIR || exit 1 +pushd $DOCSRCDIR || exit 1 git clean -d -x -f autoconf && \ @@ -11,21 +17,23 @@ autoconf && \ make release if [ $? != 0 ]; then - echo "Docs build failed!" - exit 1 + _exit "Docs build failed!" fi -mkdir ../docs +mkdir -p ../docs rsync -Ca --delete --exclude=.git output/ ../docs/ rsync -Ca --exclude=.svn registry ../docs/ rsync -Ca --exclude=.svn archives/ ../docs/ -cd ../docs || exit 1 +cd ../docs || _exit "Error changing dir to ${DOCSDIR}/../docs/" + /bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test mv manpages-3 manpages mv htmldocs/manpages-3 htmldocs/manpages -cd ../docs-xml || exit 1 +cd ../docs-xml || _exit "Error changing dir to ${DOCSDIR}/../docs-xml/" make distclean +echo "Success" +popd exit |