diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 527238f..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -tags/ diff --git a/CNAME b/CNAME deleted file mode 100644 index e26b5ea..0000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ -fi33.buzz \ No newline at end of file diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 0e259d4..0000000 --- a/LICENSE +++ /dev/null @@ -1,121 +0,0 @@ -Creative Commons Legal Code - -CC0 1.0 Universal - - CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE - LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN - ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS - INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES - REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS - PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM - THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED - HEREUNDER. - -Statement of Purpose - -The laws of most jurisdictions throughout the world automatically confer -exclusive Copyright and Related Rights (defined below) upon the creator -and subsequent owner(s) (each and all, an "owner") of an original work of -authorship and/or a database (each, a "Work"). - -Certain owners wish to permanently relinquish those rights to a Work for -the purpose of contributing to a commons of creative, cultural and -scientific works ("Commons") that the public can reliably and without fear -of later claims of infringement build upon, modify, incorporate in other -works, reuse and redistribute as freely as possible in any form whatsoever -and for any purposes, including without limitation commercial purposes. -These owners may contribute to the Commons to promote the ideal of a free -culture and the further production of creative, cultural and scientific -works, or to gain reputation or greater distribution for their Work in -part through the use and efforts of others. - -For these and/or other purposes and motivations, and without any -expectation of additional consideration or compensation, the person -associating CC0 with a Work (the "Affirmer"), to the extent that he or she -is an owner of Copyright and Related Rights in the Work, voluntarily -elects to apply CC0 to the Work and publicly distribute the Work under its -terms, with knowledge of his or her Copyright and Related Rights in the -Work and the meaning and intended legal effect of CC0 on those rights. - -1. Copyright and Related Rights. A Work made available under CC0 may be -protected by copyright and related or neighboring rights ("Copyright and -Related Rights"). Copyright and Related Rights include, but are not -limited to, the following: - - i. the right to reproduce, adapt, distribute, perform, display, - communicate, and translate a Work; - ii. moral rights retained by the original author(s) and/or performer(s); -iii. publicity and privacy rights pertaining to a person's image or - likeness depicted in a Work; - iv. rights protecting against unfair competition in regards to a Work, - subject to the limitations in paragraph 4(a), below; - v. rights protecting the extraction, dissemination, use and reuse of data - in a Work; - vi. database rights (such as those arising under Directive 96/9/EC of the - European Parliament and of the Council of 11 March 1996 on the legal - protection of databases, and under any national implementation - thereof, including any amended or successor version of such - directive); and -vii. other similar, equivalent or corresponding rights throughout the - world based on applicable law or treaty, and any national - implementations thereof. - -2. Waiver. To the greatest extent permitted by, but not in contravention -of, applicable law, Affirmer hereby overtly, fully, permanently, -irrevocably and unconditionally waives, abandons, and surrenders all of -Affirmer's Copyright and Related Rights and associated claims and causes -of action, whether now known or unknown (including existing as well as -future claims and causes of action), in the Work (i) in all territories -worldwide, (ii) for the maximum duration provided by applicable law or -treaty (including future time extensions), (iii) in any current or future -medium and for any number of copies, and (iv) for any purpose whatsoever, -including without limitation commercial, advertising or promotional -purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each -member of the public at large and to the detriment of Affirmer's heirs and -successors, fully intending that such Waiver shall not be subject to -revocation, rescission, cancellation, termination, or any other legal or -equitable action to disrupt the quiet enjoyment of the Work by the public -as contemplated by Affirmer's express Statement of Purpose. - -3. Public License Fallback. Should any part of the Waiver for any reason -be judged legally invalid or ineffective under applicable law, then the -Waiver shall be preserved to the maximum extent permitted taking into -account Affirmer's express Statement of Purpose. In addition, to the -extent the Waiver is so judged Affirmer hereby grants to each affected -person a royalty-free, non transferable, non sublicensable, non exclusive, -irrevocable and unconditional license to exercise Affirmer's Copyright and -Related Rights in the Work (i) in all territories worldwide, (ii) for the -maximum duration provided by applicable law or treaty (including future -time extensions), (iii) in any current or future medium and for any number -of copies, and (iv) for any purpose whatsoever, including without -limitation commercial, advertising or promotional purposes (the -"License"). The License shall be deemed effective as of the date CC0 was -applied by Affirmer to the Work. Should any part of the License for any -reason be judged legally invalid or ineffective under applicable law, such -partial invalidity or ineffectiveness shall not invalidate the remainder -of the License, and in such case Affirmer hereby affirms that he or she -will not (i) exercise any of his or her remaining Copyright and Related -Rights in the Work or (ii) assert any associated claims and causes of -action with respect to the Work, in either case contrary to Affirmer's -express Statement of Purpose. - -4. Limitations and Disclaimers. - - a. No trademark or patent rights held by Affirmer are waived, abandoned, - surrendered, licensed or otherwise affected by this document. - b. Affirmer offers the Work as-is and makes no representations or - warranties of any kind concerning the Work, express, implied, - statutory or otherwise, including without limitation warranties of - title, merchantability, fitness for a particular purpose, non - infringement, or the absence of latent or other defects, accuracy, or - the present or absence of errors, whether or not discoverable, all to - the greatest extent permissible under applicable law. - c. Affirmer disclaims responsibility for clearing rights of other persons - that may apply to the Work or any use thereof, including without - limitation any person's Copyright and Related Rights in the Work. - Further, Affirmer disclaims responsibility for obtaining any necessary - consents, permissions or other rights required for any use of the - Work. - d. Affirmer understands and acknowledges that Creative Commons is not a - party to this document and has no duty or obligation with respect to - this CC0 or use of the Work. diff --git a/Makefile b/Makefile deleted file mode 100644 index 9353745..0000000 --- a/Makefile +++ /dev/null @@ -1,204 +0,0 @@ -#!/usr/bin/make -f - -BLOG := $(MAKE) -f $(lastword $(MAKEFILE_LIST)) --no-print-directory -ifneq ($(filter-out help,$(MAKECMDGOALS)),) -include config -endif - -# The following can be configured in config -BLOG_DATE_FORMAT_INDEX ?= %x -BLOG_DATE_FORMAT ?= %x %X -BLOG_TITLE ?= blog -BLOG_DESCRIPTION ?= blog -BLOG_URL_ROOT ?= http://localhost/blog -BLOG_FEED_MAX ?= 20 -BLOG_FEEDS ?= rss atom -BLOG_SRC ?= articles - - -.PHONY: help init build deploy clean - -ARTICLES = $(shell git ls-tree HEAD --name-only -- $(BLOG_SRC)/ 2>/dev/null) -TAGFILES = $(patsubst $(BLOG_SRC)/%.md,tags/%,$(ARTICLES)) - -help: - $(info blogit init|build|deploy|clean) - -init: - mkdir -p $(BLOG_SRC) data templates - printf '$$TITLE' > templates/header.html - printf '' > templates/footer.html - printf '

will holdsworth'\''s blog

' > templates/index_header.html - printf '

tags: ' > templates/tag_list_header.html - printf '#$$NAME' > templates/tag_entry.html - printf ', ' > templates/tag_separator.html - printf '

' > templates/tag_list_footer.html - printf '

posts

' > templates/article_list_footer.html - printf '


' > templates/index_footer.html - printf '

#$$TAGS

' > templates/tag_index_header.html - printf '' > templates/tag_index_footer.html - printf '

will holdsworth'\''s blog

$$TITLE

posted: $$DATE_POSTED
edited: $$DATE_EDITED

' > templates/article_header.html - printf '


' > templates/article_footer.html - printf 'blog\n' > .git/info/exclude - -build: blog/index.html tagpages $(patsubst $(BLOG_SRC)/%.md,blog/%.html,$(ARTICLES)) $(patsubst %,blog/%.xml,$(BLOG_FEEDS)) - -deploy: build - rsync -rLtvz $(BLOG_RSYNC_OPTS) blog/ data/ $(BLOG_REMOTE) - -clean: - rm -rf blog tags - -config: - printf 'BLOG_REMOTE:=%s\n' \ - '$(shell printf "Blog remote (eg: host:/var/www/html): ">/dev/tty; head -n1)' \ - > $@ - -tags/%: $(BLOG_SRC)/%.md - mkdir -p tags - grep -i '^; *tags:' "$<" | cut -d: -f2- | sed 's/ */\n/g' | sed '/^$$/d' | sort -u > $@ - -blog/index.html: $(ARTICLES) $(TAGFILES) $(addprefix templates/,$(addsuffix .html,header index_header tag_list_header tag_entry tag_separator tag_list_footer article_list_header article_entry article_separator article_list_footer index_footer footer)) - mkdir -p blog - TITLE="$(BLOG_TITLE)"; \ - export TITLE; \ - envsubst < templates/header.html > $@; \ - envsubst < templates/index_header.html >> $@; \ - envsubst < templates/tag_list_header.html >> $@; \ - first=true; \ - for t in $(shell cat $(TAGFILES) | sort -u); do \ - "$$first" || envsubst < templates/tag_separator.html; \ - NAME="$$t" \ - URL="@$$t.html" \ - envsubst < templates/tag_entry.html; \ - first=false; \ - done >> $@; \ - envsubst < templates/tag_list_footer.html >> $@; \ - envsubst < templates/article_list_header.html >> $@; \ - first=true; \ - for f in $(ARTICLES); do \ - printf '%s ' "$$f"; \ - git log --diff-filter=A --date="format:%s $(BLOG_DATE_FORMAT_INDEX)" --pretty=format:'%ad%n' -- "$$f"; \ - done | sort -k2nr | cut -d" " -f1,3- | while IFS=" " read -r FILE DATE; do \ - "$$first" || envsubst < templates/article_separator.html; \ - URL="`printf '%s' "\$$FILE" | sed 's,^$(BLOG_SRC)/\(.*\).md,\1,'`.html" \ - DATE="$$DATE" \ - TITLE="`head -n1 "\$$FILE" | sed -e 's/^# //g'`" \ - envsubst < templates/article_entry.html; \ - first=false; \ - done >> $@; \ - envsubst < templates/article_list_footer.html >> $@; \ - envsubst < templates/index_footer.html >> $@; \ - envsubst < templates/footer.html >> $@; \ - - -blog/tag/%.html: $(ARTICLES) $(addprefix templates/,$(addsuffix .html,header tag_header index_entry tag_footer footer)) - -.PHONY: tagpages -tagpages: $(TAGFILES) - +$(BLOG) $(patsubst %,blog/@%.html,$(shell cat $(TAGFILES) | sort -u)) - -blog/@%.html: $(TAGFILES) $(addprefix templates/,$(addsuffix .html,header tag_index_header tag_list_header tag_entry tag_separator tag_list_footer article_list_header article_entry article_separator article_list_footer tag_index_footer footer)) - mkdir -p blog - TITLE="Articles tagged $*"; \ - TAGS="$*"; \ - export TITLE; \ - export TAGS; \ - envsubst < templates/header.html > $@; \ - envsubst < templates/tag_index_header.html >> $@; \ - envsubst < templates/article_list_header.html >> $@; \ - first=true; \ - for f in $(shell grep -FH '$*' $(TAGFILES) | sed 's,^tags/\([^:]*\):.*,$(BLOG_SRC)/\1.md,'); do \ - printf '%s ' "$$f"; \ - git log --diff-filter=A --date="format:%s $(BLOG_DATE_FORMAT_INDEX)" --pretty=format:'%ad%n' -- "$$f"; \ - done | sort -k2nr | cut -d" " -f1,3- | while IFS=" " read -r FILE DATE; do \ - "$$first" || envsubst < templates/article_separator.html; \ - URL="`printf '%s' "\$$FILE" | sed 's,^$(BLOG_SRC)/\(.*\).md,\1,'`.html" \ - DATE="$$DATE" \ - TITLE="`head -n1 "\$$FILE" | sed -e 's/^# //g'`" \ - envsubst < templates/article_entry.html; \ - first=false; \ - done >> $@; \ - envsubst < templates/article_list_footer.html >> $@; \ - envsubst < templates/tag_index_footer.html >> $@; \ - envsubst < templates/footer.html >> $@; \ - - -blog/%.html: $(BLOG_SRC)/%.md $(addprefix templates/,$(addsuffix .html,header article_header article_footer footer)) - mkdir -p blog - TITLE="$(shell head -n1 $<)"; \ - export TITLE; \ - AUTHOR="$(shell git log -n 1 --reverse --format="%cn" -- "$<")"; \ - export AUTHOR; \ - DATE_POSTED="$(shell git log --diff-filter=A --date="format:$(BLOG_DATE_FORMAT)" --pretty=format:'%ad' -- "$<")"; \ - export DATE_POSTED; \ - DATE_EDITED="$(shell git log -n 1 --date="format:$(BLOG_DATE_FORMAT)" --pretty=format:'%ad' -- "$<")"; \ - export DATE_EDITED; \ - TAGS="$(shell grep -i '^; *tags:' "$<" | cut -d: -f2- | paste -sd ',')"; \ - export TAGS; \ - envsubst < templates/header.html > $@; \ - envsubst < templates/article_header.html >> $@; \ - sed -e 1d \ - -e '/^;/d' \ - -e 's/&/\&/g' \ - -e 's//\>/g' \ - -e '/^```$$/{s,.*,,;x;p;/^<\/code>/d;s,.*,
,;bT}' \
-		-e 'x;/<\/code>/{x;s,\$$,\$,g;$$G;p;d};x' \
-		-e 's,\\\$$,\$,g' \
-		-e '/^####/{s,^####,
,;s,$$,
,;H;s,.*,,;x;p;d}' \
-		-e '/^###/{s,^###,
,;s,$$,
,;H;s,.*,,;x;p;d}' \
-		-e '/^##/{s,^##,
,;s,$$,
,;H;s,.*,,;x;p;d}' \
-		-e '/^#/{s,^#,
,;s,$$,
,;H;s,.*,,;x;p;d}' \
-		-e 's,`\([^`]*\)`,\1,g' \
-		-e 's,\*\*\(\([^*<>][^*<>]*\*\?\)*\)\*\*,\1,g' \
-		-e 's,\*\([^*<>][^*<>]*\)\*,\1,g' \
-		-e 's,!\[\([^]]*\)\](\([^)]*\)),\1,g' \
-		-e 's,\[\([^]]*\)\](\([^)]*\)),\1,g' \
-		-e '/^- /{s,^- ,
  • ,;s,$$,
    • ,;x;/^<\/ul>/{x;bL};p;s,.*,
\ No newline at end of file
diff --git a/templates/article_list_header.html b/templates/article_list_header.html
deleted file mode 100644
index 2966721..0000000
--- a/templates/article_list_header.html
+++ /dev/null
@@ -1 +0,0 @@
-
    posts