From 6164e2dc904699e86c09244f214bbaf5b26fd2fb Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Thu, 26 Jan 2017 00:39:06 +0100
Subject: [PATCH] Fix tests and unfortunate captcha dir name choice.

---
 README.md                                          | 6 +++---
 processor/default.html.do                          | 2 +-
 test/test_files/captchas/{ => linkable}/bar baz    | 0
 test/test_files/captchas/{ => linkable}/foo        | 0
 test/test_files/captchas/{ => linkable}/te&quot;st | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename test/test_files/captchas/{ => linkable}/bar baz (100%)
 rename test/test_files/captchas/{ => linkable}/foo (100%)
 rename test/test_files/captchas/{ => linkable}/te&quot;st (100%)

diff --git a/README.md b/README.md
index c1d9f4b..88573aa 100644
--- a/README.md
+++ b/README.md
@@ -33,9 +33,9 @@ these links will be added as article-specific linkbacks to the .html file and
 the feed entry.
 
 Just like the .links files, article-specific files containing captcha data are
-created and can be edited in ./captchas/. The first line of such a file is meant
-as a captcha, and the second line as its description, which may be inserted via
-templating into the article HTML file.
+created and can be edited in ./captchas/linkable/. The first line of such a file
+is meant as a captcha, and the second line as its description, which may be
+inserted via templating into the article HTML file.
 
 Some metadata files will also be generated below ./metadata/: For each article,
 there will be generated a .automatic_metadata (to contain an article's UUID,
diff --git a/processor/default.html.do b/processor/default.html.do
index 31fa9cd..8e88dbb 100644
--- a/processor/default.html.do
+++ b/processor/default.html.do
@@ -10,7 +10,7 @@ prep_url() {
 # Pull in global dependencies.
 . ./helpers.sh
 metadata_dir=metadata
-captchas_dir=captchas/public
+captchas_dir=captchas/linkable
 mkdir -p "$captchas_dir"
 meta_file="${metadata_dir}/${1%.html}.automatic_metadata"
 redo-ifchange "$meta_file"
diff --git a/test/test_files/captchas/bar baz b/test/test_files/captchas/linkable/bar baz
similarity index 100%
rename from test/test_files/captchas/bar baz
rename to test/test_files/captchas/linkable/bar baz
diff --git a/test/test_files/captchas/foo b/test/test_files/captchas/linkable/foo
similarity index 100%
rename from test/test_files/captchas/foo
rename to test/test_files/captchas/linkable/foo
diff --git a/test/test_files/captchas/te&quot;st b/test/test_files/captchas/linkable/te&quot;st
similarity index 100%
rename from test/test_files/captchas/te&quot;st
rename to test/test_files/captchas/linkable/te&quot;st
-- 
2.30.2