aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Makefile12
-rw-r--r--_config.yml3
-rwxr-xr-xaux/assert-shellcheck.sh (renamed from build-aux/assert-shellcheck.sh)0
-rwxr-xr-xaux/ci/ci-build.sh (renamed from build-aux/ci/ci-build.sh)4
-rwxr-xr-xaux/ci/git-post-receive.sh (renamed from build-aux/ci/git-post-receive.sh)0
-rwxr-xr-xaux/ci/git-pre-push.sh (renamed from build-aux/ci/git-pre-push.sh)4
-rw-r--r--aux/guix/manifest.scm (renamed from build-aux/guix/manifest.scm)0
-rw-r--r--aux/guix/pinned-channels.scm (renamed from build-aux/guix/pinned-channels.scm)0
-rwxr-xr-xaux/guix/with-container.sh4
-rwxr-xr-xaux/workflow/TODOs.sh (renamed from build-aux/workflow/TODOs.sh)4
-rwxr-xr-xaux/workflow/assert-todos.sh (renamed from build-aux/workflow/assert-todos.sh)2
-rw-r--r--aux/workflow/preamble.md (renamed from build-aux/workflow/preamble.md)0
-rw-r--r--aux/workflow/style.css (renamed from build-aux/workflow/style.css)0
-rwxr-xr-xbuild-aux/guix/with-container.sh4
-rwxr-xr-xscripts/apply-translations.sh (renamed from build-aux/apply-translations.sh)2
-rwxr-xr-xscripts/assert-spelling.sh (renamed from build-aux/assert-spelling.sh)4
-rwxr-xr-xscripts/extract-translations.sh (renamed from build-aux/extract-translations.sh)0
-rw-r--r--scripts/spelling/en.txt (renamed from build-aux/spelling/en.txt)0
-rw-r--r--scripts/spelling/eo.txt (renamed from build-aux/spelling/eo.txt)0
-rw-r--r--scripts/spelling/fr.txt (renamed from build-aux/spelling/fr.txt)0
-rw-r--r--scripts/spelling/international.txt (renamed from build-aux/spelling/international.txt)0
-rw-r--r--scripts/spelling/pt.txt (renamed from build-aux/spelling/pt.txt)0
22 files changed, 22 insertions, 21 deletions
diff --git a/Makefile b/Makefile
index 8d910e3..1870865 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
.PHONY: check
check:
- sh build-aux/assert-spelling.sh
- sh build-aux/assert-shellcheck.sh
- sh build-aux/workflow/assert-todos.sh
- sh build-aux/extract-translations.sh
- sh build-aux/apply-translations.sh
+ sh aux/assert-shellcheck.sh
+ sh aux/workflow/assert-todos.sh
+ sh scripts/assert-spelling.sh
+ sh scripts/extract-translations.sh
+ sh scripts/apply-translations.sh
.PHONY: clean
clean:
@@ -18,4 +18,4 @@ OUT = public
.PHONY: public
public:
JEKYLL_ENV=production jekyll build -d $(OUT) --trace
- sh build-aux/workflow/TODOs.sh $(NAME_UC) $(NAME) $(MAILING_LIST)
+ sh aux/workflow/TODOs.sh $(NAME_UC) $(NAME) $(MAILING_LIST)
diff --git a/_config.yml b/_config.yml
index d58209e..2a67538 100644
--- a/_config.yml
+++ b/_config.yml
@@ -29,7 +29,8 @@ exclude:
- Gemfile.lock
- README
- TODOs.md
- - build-aux/
+ - aux/
+ - scripts/
- COPYING
- default.nix
- shell.nix
diff --git a/build-aux/assert-shellcheck.sh b/aux/assert-shellcheck.sh
index 334a875..334a875 100755
--- a/build-aux/assert-shellcheck.sh
+++ b/aux/assert-shellcheck.sh
diff --git a/build-aux/ci/ci-build.sh b/aux/ci/ci-build.sh
index 0b792df..c891d3b 100755
--- a/build-aux/ci/ci-build.sh
+++ b/aux/ci/ci-build.sh
@@ -35,8 +35,8 @@ EOF
git config --global user.email git@euandre.org
git config --global user.name 'EuAndreh CI'
- if [ -f build-aux/guix/with-container.sh ]; then
- RUNNER='./build-aux/guix/with-container.sh'
+ if [ -f aux/guix/with-container.sh ]; then
+ RUNNER='./aux/guix/with-container.sh'
else
RUNNER='sh -c'
fi
diff --git a/build-aux/ci/git-post-receive.sh b/aux/ci/git-post-receive.sh
index 2f6e3c0..2f6e3c0 100755
--- a/build-aux/ci/git-post-receive.sh
+++ b/aux/ci/git-post-receive.sh
diff --git a/build-aux/ci/git-pre-push.sh b/aux/ci/git-pre-push.sh
index 2d2bcb1..30d2850 100755
--- a/build-aux/ci/git-pre-push.sh
+++ b/aux/ci/git-pre-push.sh
@@ -15,5 +15,5 @@ fi
scp "$DESCRIPTION" "git.euandreh.xyz:$REMOTE_GIT_DIR/description"
ssh git.euandreh.xyz mkdir -p "$LOGS_DIR"
-scp build-aux/ci/ci-build.sh "git.euandreh.xyz:$(dirname "$LOGS_DIR")/ci-build.sh"
-scp build-aux/ci/git-post-receive.sh "git.euandreh.xyz:$REMOTE_GIT_DIR/hooks/post-receive"
+scp aux/ci/ci-build.sh "git.euandreh.xyz:$(dirname "$LOGS_DIR")/ci-build.sh"
+scp aux/ci/git-post-receive.sh "git.euandreh.xyz:$REMOTE_GIT_DIR/hooks/post-receive"
diff --git a/build-aux/guix/manifest.scm b/aux/guix/manifest.scm
index 0c8a225..0c8a225 100644
--- a/build-aux/guix/manifest.scm
+++ b/aux/guix/manifest.scm
diff --git a/build-aux/guix/pinned-channels.scm b/aux/guix/pinned-channels.scm
index 67b5a51..67b5a51 100644
--- a/build-aux/guix/pinned-channels.scm
+++ b/aux/guix/pinned-channels.scm
diff --git a/aux/guix/with-container.sh b/aux/guix/with-container.sh
new file mode 100755
index 0000000..db7b121
--- /dev/null
+++ b/aux/guix/with-container.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -eux
+
+guix time-machine -C aux/guix/pinned-channels.scm -- environment --pure -C -m aux/guix/manifest.scm -- sh -c "$@"
diff --git a/build-aux/workflow/TODOs.sh b/aux/workflow/TODOs.sh
index 3f9fa4b..ab45835 100755
--- a/build-aux/workflow/TODOs.sh
+++ b/aux/workflow/TODOs.sh
@@ -9,7 +9,7 @@ export MAILING_LIST="$3"
REGEX='s/^## (TODO|DOING|WAITING|MEETING|INACTIVE|NEXT|CANCELLED|DONE) (.*) \{#(.*?)\}$/## <a href="#\3"><span class="\1">\1<\/span> \2<\/a>\n<span class="header-anchor" id="\3">#\3<\/span>\n/'
-envsubst < build-aux/workflow/preamble.md | \
+envsubst < aux/workflow/preamble.md | \
printf '%s\n\n%s' "$(cat -)" "$(perl -pe "$REGEX" TODOs.md)" | \
pandoc --toc \
--highlight-style pygments \
@@ -19,5 +19,5 @@ envsubst < build-aux/workflow/preamble.md | \
--metadata lang=en \
-r markdown \
-w html \
- -H build-aux/workflow/style.css \
+ -H aux/workflow/style.css \
> public/TODOs.html
diff --git a/build-aux/workflow/assert-todos.sh b/aux/workflow/assert-todos.sh
index 1d568cb..203d465 100755
--- a/build-aux/workflow/assert-todos.sh
+++ b/aux/workflow/assert-todos.sh
@@ -1,7 +1,7 @@
#!/bin/sh
set -eu
-if git grep FIXME | grep -v '^TODOs.md' | grep -v '^build-aux/workflow/assert-todos.sh' | grep -v '^build-aux/docbook-xsl/'; then
+if git grep FIXME | grep -v '^TODOs.md' | grep -v '^aux/workflow/assert-todos.sh' | grep -v '^aux/docbook-xsl/'; then
echo "Found dangling FIXME markers on the project."
echo "You should write them down properly on TODOs.md."
exit 1
diff --git a/build-aux/workflow/preamble.md b/aux/workflow/preamble.md
index c6ae56e..c6ae56e 100644
--- a/build-aux/workflow/preamble.md
+++ b/aux/workflow/preamble.md
diff --git a/build-aux/workflow/style.css b/aux/workflow/style.css
index ac0144c..ac0144c 100644
--- a/build-aux/workflow/style.css
+++ b/aux/workflow/style.css
diff --git a/build-aux/guix/with-container.sh b/build-aux/guix/with-container.sh
deleted file mode 100755
index 5969d38..0000000
--- a/build-aux/guix/with-container.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -eux
-
-guix time-machine -C build-aux/guix/pinned-channels.scm -- environment --pure -C -m build-aux/guix/manifest.scm -- sh -c "$@"
diff --git a/build-aux/apply-translations.sh b/scripts/apply-translations.sh
index 190b777..5920717 100755
--- a/build-aux/apply-translations.sh
+++ b/scripts/apply-translations.sh
@@ -1,7 +1,7 @@
#!/bin/sh
set -eu
-for f in $(git ls-files | grep -E '.(md|slides)$' | grep -Ev '^(vendor/reveal.js|TODOs.md|build-aux/)'); do
+for f in $(git ls-files | grep -E '.(md|slides)$' | grep -Ev '^(vendor/reveal.js|TODOs.md|aux/)'); do
l="$(grep '^lang: ..$' "$f" | awk '{print $2}')"
if [ "$l" != 'en' ]; then
ref="$(grep '^ref: ' "$f" | awk '{print $2}')"
diff --git a/build-aux/assert-spelling.sh b/scripts/assert-spelling.sh
index 33da3e3..f0053b4 100755
--- a/build-aux/assert-spelling.sh
+++ b/scripts/assert-spelling.sh
@@ -4,7 +4,7 @@ set -eu
export LANG=C.UTF-8
export JEKYLL_ENV=production
-for DICT in build-aux/spelling/*.txt; do
+for DICT in scripts/spelling/*.txt; do
sort "$DICT" | diff - "$DICT" || {
echo "The $DICT dictionary is unsorted. To fix it, run:" >&2
echo " LANG=C.UTF-8 sort $DICT | sponge $DICT" >&2
@@ -19,7 +19,7 @@ for f in $(find _site -type f -name '*.html'); do
if ! echo "$f" | grep -qE '(/vendor/|TODOs.html)'; then
l="$(head -n2 "$f" | tail -n1 | cut -d\" -f2)"
CURR_DICT="$(mktemp)"
- cat build-aux/spelling/international.txt "build-aux/spelling/$l.txt" > "$CURR_DICT"
+ cat scripts/spelling/international.txt "scripts/spelling/$l.txt" > "$CURR_DICT"
hunspell -u3 -H -d "$l" -p "$CURR_DICT" "$f" | tee -a "$OUT"
fi
done
diff --git a/build-aux/extract-translations.sh b/scripts/extract-translations.sh
index 2333865..2333865 100755
--- a/build-aux/extract-translations.sh
+++ b/scripts/extract-translations.sh
diff --git a/build-aux/spelling/en.txt b/scripts/spelling/en.txt
index d54b934..d54b934 100644
--- a/build-aux/spelling/en.txt
+++ b/scripts/spelling/en.txt
diff --git a/build-aux/spelling/eo.txt b/scripts/spelling/eo.txt
index 8629511..8629511 100644
--- a/build-aux/spelling/eo.txt
+++ b/scripts/spelling/eo.txt
diff --git a/build-aux/spelling/fr.txt b/scripts/spelling/fr.txt
index aa09184..aa09184 100644
--- a/build-aux/spelling/fr.txt
+++ b/scripts/spelling/fr.txt
diff --git a/build-aux/spelling/international.txt b/scripts/spelling/international.txt
index d87507e..d87507e 100644
--- a/build-aux/spelling/international.txt
+++ b/scripts/spelling/international.txt
diff --git a/build-aux/spelling/pt.txt b/scripts/spelling/pt.txt
index c7da56d..c7da56d 100644
--- a/build-aux/spelling/pt.txt
+++ b/scripts/spelling/pt.txt