From 02e47f1472703876a63c3a1eb448831ae01d9cfc Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Wed, 8 Jan 2014 13:18:55 +0100 Subject: build-web-site: Rename variables "Work dir" is a better description than "target dir". diff --git a/bin/build-web-site b/bin/build-web-site index a7d67f0..cbfc8c3 100755 --- a/bin/build-web-site +++ b/bin/build-web-site @@ -23,11 +23,11 @@ export PATH="$prefix/libexec:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin: myself=${0##*/} man_source_dir="$prefix/web/work/man" guidelines_source="$prefix/web/work/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" +site_work_dir=$(mktemp -d "/tmp/$myself.XXXXXX") +man_work_dir="$site_work_dir/input/doc/man" +guidelines_target="$site_work_dir/input/doc/guidelines.html" -trap 'rm -rf "$site_target_dir"' EXIT +trap 'rm -rf "$site_work_dir"' EXIT if [ $# -gt 0 ] && [ "$1" = '-t' ] then # Build test instance. @@ -39,16 +39,16 @@ else fi # Grab the Poole source of the site. -tar -C "$site_source_dir" -cf - 'input' | tar -C "$site_target_dir" -xpf - -cp "$site_source_dir/macros.py" "$site_target_dir" -cp "$site_source_dir/page.html" "$site_target_dir" +tar -C "$site_source_dir" -cf - 'input' | tar -C "$site_work_dir" -xpf - +cp "$site_source_dir/macros.py" "$site_work_dir" +cp "$site_source_dir/page.html" "$site_work_dir" # Grab the pre-built documentation. -tar -C "$man_source_dir" -cf - '.' | tar -C "$man_target_dir" -xpf - +tar -C "$man_source_dir" -cf - '.' | tar -C "$man_work_dir" -xpf - cp "$guidelines_source" "$guidelines_target" # Create a link to the output directory. -ln -s "$output_dir" "$site_target_dir/output" +ln -s "$output_dir" "$site_work_dir/output" # # See http://pythonhosted.org/Markdown/extensions/ for documentation on the @@ -59,4 +59,4 @@ poole --build \ --md-ext='headerid' \ --md-ext='toc' \ --md-ext='wikilinks' \ - "$site_target_dir" + "$site_work_dir" -- cgit v0.10-9-g596f