Commit 4895a3bb authored by Simon McVittie's avatar Simon McVittie

* update-dbus-docs.sh: Assorted improvements:

- Default user if $FDUSER is not set is the ssh default
  (set in ~/.ssh/config or based on the local username), not a
  hard-coded "johnp"
- Temporary checkout directory is created securely (preventing symlink
  attacks), if mktemp(1) is available
- Use make -C rather than cd && make && cd ..
parent c9780cf5
2007-05-21 Simon McVittie <simon.mcvittie@collabora.co.uk>
* update-dbus-docs.sh: Assorted improvements:
- Default user if $FDUSER is not set is the ssh default
(set in ~/.ssh/config or based on the local username), not a
hard-coded "johnp"
- Temporary checkout directory is created securely (preventing symlink
attacks), if mktemp(1) is available
- Use make -C rather than cd && make && cd ..
2007-05-21 Simon McVittie <simon.mcvittie@collabora.co.uk>
* HACKING: Point to correct mailing list
......
......@@ -6,14 +6,15 @@ function die()
exit 1
}
if test -z "$FDUSER" ; then
FDUSER=johnp
if test -n "$FDUSER" ; then
echo "Using freedesktop.org account $FDUSER"
user="$FDUSER@"
else
echo "Using freedesktop.org account from ~/.ssh/config, or local username"
fi
echo "Using freedesktop.org account $FDUSER"
CHECKOUTDIR=/tmp/dbus-for-docs
export CVSROOT=:ext:$FDUSER@cvs.freedesktop.org:/cvs/dbus
CHECKOUTDIR=`mktemp -d || echo /tmp/dbus-for-docs`
export CVSROOT=":ext:${user}cvs.freedesktop.org:/cvs/dbus"
cd $CHECKOUTDIR || die "could not changedir to $CHECKOUTDIR"
......@@ -29,9 +30,7 @@ echo "Configuring and building docs"
## you won't fail to update those docs
./autogen.sh --enable-xml-docs=yes --enable-doxygen-docs=yes || die "could not autogen"
doxygen Doxyfile || die "could not run Doxygen"
cd doc || die "could not cd to doc dir"
make || die "could not build docs"
cd .. || die "could not cd up"
make -C doc || die "could not build docs"
MANFILES=`find -name "dbus*.1"`
for M in $MANFILES ; do
......@@ -50,6 +49,6 @@ find doc -not -type d | grep -v CVS | grep -v -E '.~[0-9.]+~' | grep -v Makefile
diff -u filesystem.list tarball.list || die "some files were not included"
echo "Uploading docs to server"
scp dbus-docs.tar.gz "$FDUSER"@pdx.freedesktop.org:
ssh "$FDUSER"@pdx.freedesktop.org '(cd /srv/dbus.freedesktop.org/www/ && /bin/cp -f ~/dbus-docs.tar.gz . && tar zxf dbus-docs.tar.gz && echo "Successfully unpacked tarball on server")'
scp dbus-docs.tar.gz "${user}"dbus.freedesktop.org:
ssh "${user}"dbus.freedesktop.org '(cd /srv/dbus.freedesktop.org/www/ && /bin/cp -f ~/dbus-docs.tar.gz . && tar zxf dbus-docs.tar.gz && echo "Successfully unpacked tarball on server")'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment