* 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 ..

diff --git a/ChangeLog b/ChangeLog
index df4adfba5dfa3b3d9b1574cc8ed0ec990c1f850f..6e51edb3a9aba22cc2b94653a1bf6686524bae97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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

diff --git a/update-dbus-docs.sh b/update-dbus-docs.sh
index 1caa40a5ef974bb5f4c64f95f075873426a49f26..e7cf861db2628930896eb367ebedb4b4aabea765 100755 (executable)
--- a/update-dbus-docs.sh
+++ b/update-dbus-docs.sh
@@ -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")'