FSFE/fsfe-website
27
33
Fork 93
Code Issues 64 Pull Requests 18 Wiki Activity

allow building to rsync target, remove globbing from status report

Browse Source 
svn path=/trunk/; revision=34242
This commit is contained in:
paul
2016-09-08 00:40:34 +00:00
parent 51179ae757
commit d05f339e7b
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/arguments.sh
View File

@@ -91,9 +91,13 @@ if [ -z "$inc_arguments" ]; then
readonly tree="${tree:+$(realpath "$tree")}"
readonly stagedir="${stagedir:+$(realpath "$stagedir")}"
readonly basedir="${basedir:+$(realpath "$basedir")}"
readonly target="${target:+$(realpath "$target")}"
readonly domain="${domain:-www.fsfe.org}"
readonly command
if [ "$stagedir" != "$target" ] && printf %s "$target" |egrep -q '^.+@.+:(.+)?$'; then
readonly target
else
readonly target="${target:+$(realpath "$target")}"
fi
case "$command" in
build_into) [ -z "$target" ] && die "Missing destination directory" ;;

2
build/status.html.sh
View File

@@ -34,7 +34,6 @@ t_premake=$(stat -c %Y "premake" ||echo 0)
t_makefile=$(stat -c %Y "Makefile" ||echo 0)
t_makecopy=$(stat -c %Y "Make_copy" ||echo 0)
t_makesourcecopy=$(stat -c %Y "Make_sourcecopy" ||echo 0)
t_makeglobrules=$(stat -c %Y "Make_globs" ||echo 0)
t_makexslt=$(stat -c %Y "Make_xslt" ||echo 0)
t_makexhtml=$(stat -c %Y "Make_xhtml" ||echo 0)
t_manifest=$(stat -c %Y "manifest" ||echo 0)
@@ -191,7 +190,6 @@ label {
<h3>Header</h3>$(web_tab Makeheadertab "" "<pre>$(head Makefile |htmlcat)</pre>")
<h3>Copy rules</h3>$(web_tab Makecopytab "Generation time: $(duration $(($t_makecopy - $t_premake)))" "<pre>$(tail Make_copy |htmlcat)</pre>")
<h3>Source copy rules</h3>$(web_tab Makescopytab "Generation time: $(duration $(($t_makesourcecopy - $t_premake)))" "<pre>$(tail Make_sourcecopy |htmlcat)</pre>")
<h3>Glob rules</h3>$(web_tab Makeglobstab "Generation time: $(duration $(($t_makeglobrules - $t_premake)))" "<pre>$(tail Make_globs |htmlcat)</pre>")
<h3>XSLT rules</h3>$(web_tab Makexslttab "Generation time: $(duration $(($t_makexslt - $t_premake)))" "<pre>$(tail Make_xslt |htmlcat)</pre>")
<h3>XHTML rules</h3>$(web_tab Makexhtmltab "Generation time: $(duration $(($t_makexhtml - $t_premake)))" "<pre>$(tail Make_xhtml |htmlcat)</pre>")
<h3>Full Makefile</h3>$(web_tab Makefilefull "<a href="Makefile">view</a>" "")"