From: Christian Heller Date: Wed, 25 Jan 2017 23:39:06 +0000 (+0100) Subject: Fix tests and unfortunate captcha dir name choice. X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/%7B%7B%20web_path%20%7D%7D/decks/template?a=commitdiff_plain;h=6164e2dc904699e86c09244f214bbaf5b26fd2fb;p=redo-blog Fix tests and unfortunate captcha dir name choice. --- 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/bar baz deleted file mode 100644 index 42bf241..0000000 --- a/test/test_files/captchas/bar baz +++ /dev/null @@ -1,2 +0,0 @@ -apple -apple \ No newline at end of file diff --git a/test/test_files/captchas/foo b/test/test_files/captchas/foo deleted file mode 100644 index 42bf241..0000000 --- a/test/test_files/captchas/foo +++ /dev/null @@ -1,2 +0,0 @@ -apple -apple \ No newline at end of file diff --git a/test/test_files/captchas/linkable/bar baz b/test/test_files/captchas/linkable/bar baz new file mode 100644 index 0000000..42bf241 --- /dev/null +++ b/test/test_files/captchas/linkable/bar baz @@ -0,0 +1,2 @@ +apple +apple \ No newline at end of file diff --git a/test/test_files/captchas/linkable/foo b/test/test_files/captchas/linkable/foo new file mode 100644 index 0000000..42bf241 --- /dev/null +++ b/test/test_files/captchas/linkable/foo @@ -0,0 +1,2 @@ +apple +apple \ No newline at end of file diff --git a/test/test_files/captchas/linkable/te"st b/test/test_files/captchas/linkable/te"st new file mode 100644 index 0000000..42bf241 --- /dev/null +++ b/test/test_files/captchas/linkable/te"st @@ -0,0 +1,2 @@ +apple +apple \ No newline at end of file diff --git a/test/test_files/captchas/te"st b/test/test_files/captchas/te"st deleted file mode 100644 index 42bf241..0000000 --- a/test/test_files/captchas/te"st +++ /dev/null @@ -1,2 +0,0 @@ -apple -apple \ No newline at end of file