nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify asciidoc-helper

Browse Source 
We don't need sed for our string manipulation, so let's get rid of
it. Suggested by weasel.
This commit is contained in:
Sebastian Hahn 2010-02-27 17:06:06 +01:00
parent f9de12b864
commit 0cd1b499b4
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -30,7 +30,7 @@ Changes in version 0.2.2.10-alpha - 2010-??-??
o Code simplifications and refactoring: o Code simplifications and refactoring:
- Fix some urls in the exit notice file and make it XHTML1.1 strict - Fix some urls in the exit notice file and make it XHTML1.1 strict
compliant. Based on a patch from Christian Kujau. compliant. Based on a patch from Christian Kujau.
- Don't use sed in asciidoc-helper anymore.
Changes in version 0.2.2.9-alpha - 2010-02-22 Changes in version 0.2.2.9-alpha - 2010-02-22
o Directory authority changes: o Directory authority changes:

4
doc/Makefile.am
View File

@ -39,7 +39,7 @@ DIST_SUBDIRS = spec
# Generate the html documentation from asciidoc, but don't do # Generate the html documentation from asciidoc, but don't do
# machine-specific replacements yet # machine-specific replacements yet
$(html_in) : $(html_in) :
$(top_srcdir)/doc/asciidoc-helper.sh html @ASCIIDOC@ @SED@ $(top_srcdir)/doc/$@ $(top_srcdir)/doc/asciidoc-helper.sh html @ASCIIDOC@ $(top_srcdir)/doc/$@
tor.html.in : tor.1.txt tor.html.in : tor.1.txt
torify.html.in : torify.1.txt torify.html.in : torify.1.txt
@ -49,7 +49,7 @@ tor-resolve.html.in : tor-resolve.1.txt
# Generate the manpage from asciidoc, but don't do # Generate the manpage from asciidoc, but don't do
# machine-specific replacements yet # machine-specific replacements yet
$(man_in) : $(man_in) :
$(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ @SED@ $(top_srcdir)/doc/$@ $(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ $(top_srcdir)/doc/$@
tor.1.in : tor.1.txt tor.1.in : tor.1.txt
torify.1.in : torify.1.txt torify.1.in : torify.1.txt

13
doc/asciidoc-helper.sh
View File

@ -4,19 +4,19 @@
# See LICENSE for licensing information # See LICENSE for licensing information
# Run this to generate .html.in or .1.in files from asciidoc files. # Run this to generate .html.in or .1.in files from asciidoc files.
# Arguments: # Arguments:
# html|man asciidocpath sedpath outputfile # html|man asciidocpath outputfile
set -e set -e
if [ $# != 4 ]; then if [ $# != 3 ]; then
exit 1; exit 1;
fi fi
output=$4 output=$3
input=`echo $output | $3 -e 's/html\.in$/1\.txt/g' -e 's/1\.in$/1\.txt/g'`
base=`echo $output | $3 -e 's/\.html\.in$//g' -e 's/\.1\.in$//g'`
if [ "$1" = "html" ]; then if [ "$1" = "html" ]; then
input=${output%%.html.in}.1.txt
base=${output%%.html.in}
if [ "$2" != none ]; then if [ "$2" != none ]; then
"$2" -d manpage -o $output $input; "$2" -d manpage -o $output $input;
else else
@ -29,6 +29,9 @@ if [ "$1" = "html" ]; then
echo "=================================="; echo "==================================";
fi fi
elif [ "$1" = "man" ]; then elif [ "$1" = "man" ]; then
input=${output%%.1.in}.1.txt
base=${output%%.1.in}
if test "$2" != none; then if test "$2" != none; then
if $2 -f manpage $input; then if $2 -f manpage $input; then
mv $base.1 $output; mv $base.1 $output;