The branch, master has been updated via 93e415c1d6bec1214f9649b41b57cafe33ad7648 (commit) from fbea5364d15281f394eede5a576787c0facd6f53 (commit)

- Log ----------------------------------------------------------------- commit 93e415c1d6bec1214f9649b41b57cafe33ad7648 Author: Michal Čihař michal@cihar.com Date: Tue Jun 21 11:18:36 2011 +0200

Change working directory before run, docblox otherwise picks up css and js from phpMyAdmin instead of own

-----------------------------------------------------------------------

Summary of changes: website/pma-docs | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/website/pma-docs b/website/pma-docs index a8a3e22..1eebbf9 100755 --- a/website/pma-docs +++ b/website/pma-docs @@ -9,9 +9,10 @@ tmpfile=`mktemp -t pmadoclogXXXXXXX` chmod 644 $tmpfile cd /home/pmaweb/pma/phpmyadmin/ git pull -q +cd ~ nice -19 \ docblox run \ - -d ./ \ + -d /home/pmaweb/pma/phpmyadmin/ \ -t $tmpdir \ -i libraries/PHPExcel/*,libraries/tcpdf/*,libraries/php-gettext/* \ --title 'phpMyAdmin documentation' \

hooks/post-receive