2 files changed, 47 insertions, 21 deletions

diff --git a/bin/build-web-site b/bin/build-web-site
index 95ac355..9886b7a 100755
--- a/bin/build-web-site
+++ b/bin/build-web-site
@@ -16,31 +16,42 @@ set -e
 set -u
 
 prefix='/home/plugins'
-poole_dir="$prefix/web/generator"
-site_source_dir="$prefix/exported/site/web/content"
-site_target_dir="$poole_dir/input"
+
+export PATH="$prefix/src/poole:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin"
+
+myself=${0##*/}
 man_source_dir="$prefix/web/work/man"
-man_target_dir="$site_target_dir/doc/man"
 guidelines_source="$prefix/web/work/guidelines.html"
-guidelines_target="$site_target_dir/doc/guidelines.html"
+site_target_dir=$(mktemp -d "/tmp/$myself.XXXXXX")
+man_target_dir="$site_target_dir/input/doc/man"
+guidelines_target="$site_target_dir/input/doc/guidelines.html"
 
-export PATH="$prefix/src/poole:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin"
+trap 'rm -rf "$site_target_dir"' EXIT
+
+if [ $# -gt 0 ] && [ "$1" = '-t' ]
+then    # Build test instance.
+        site_source_dir="$prefix/exported/site-test/web"
+        output_dir="$prefix/web/test"
+else
+        site_source_dir="$prefix/exported/site/web"
+        output_dir="$prefix/web/site"
+fi
 
 #
-# Collect the pieces of the site.
+# Collect the pieces of the site, and create a link to the output directory.
 #
-rsync -aH --delete "$site_source_dir/" "$site_target_dir"
+rsync -aH "$site_source_dir/" "$site_target_dir"
 rsync -aH "$man_source_dir/" "$man_target_dir"
 cp -p "$guidelines_source" "$guidelines_target"
-
-cd "$poole_dir"
+ln -s "$output_dir" "$site_target_dir/output"
 
 #
 # See http://pythonhosted.org/Markdown/extensions/ for documentation on the
 # extensions.
 #
-exec poole.py --build   \
-    --md-ext='extra'    \
-    --md-ext='headerid' \
-    --md-ext='toc'      \
-    --md-ext='wikilinks'
+poole.py --build                \
+    --md-ext='extra'            \
+    --md-ext='headerid'         \
+    --md-ext='toc'              \
+    --md-ext='wikilinks'        \
+    "$site_target_dir"
diff --git a/bin/git-export b/bin/git-export
index fc76081..06d832a 100755
--- a/bin/git-export
+++ b/bin/git-export
@@ -18,23 +18,38 @@ set -u
 export PATH='/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin'
 
 export_prefix='/home/plugins/exported'
-export_branch='master'
 myself=${0##*/}
 
-if [ $# -lt 1 ]
-then
-        echo >&2 "Usage: $myself <repository> ..."
+usage()
+{
+        echo >&2 "Usage: $myself [-b <branch>] <repository> ..."
         exit 2
-fi
+}
+
+while getopts b: option
+do
+        case $option in
+        b)
+                branch=$OPTARG
+                ;;
+        *)
+                usage
+                ;;
+        esac
+done
+
+shift $((OPTIND - 1))
+test $# -ge 1 || usage
 
 for repository in "$@"
 do
         export_dir="$export_prefix/${repository##*/}"
         export_dir=${export_dir%.git}
+        export_dir="$export_dir${branch:+-$branch}"
 
         cd "$repository"
         rm -r -f "$export_dir"
         mkdir -p "$export_dir"
-        git archive "$export_branch" | tar -x -C "$export_dir" -f -
+        git archive "${branch:-master}" | tar -x -C "$export_dir" -f -
         cd "$OLDPWD"
 done