From bac4ca2d6627093cab2fd74e17e93c3a7574400c Mon Sep 17 00:00:00 2001 From: dongdigua Date: Wed, 14 Dec 2022 19:59:15 +0800 Subject: [PATCH] some build system fix - [BUG] `html-body-id-filter` will cause toc not work - collections add tag to mitigate bug above - `ln -s` use CI script instead of in repo --- .github/workflows/site.yml | 5 +++-- .gitignore | 1 + gopher_collections.gmi.txt | 1 - org/internet_collections.org | 15 +++++++++++++++ org/publish_config.el | 1 + patches/gmi.sh | 3 +++ patches/icons.sh | 4 ++-- re.gmi.txt | 1 - 8 files changed, 25 insertions(+), 6 deletions(-) delete mode 120000 gopher_collections.gmi.txt create mode 100755 patches/gmi.sh delete mode 120000 re.gmi.txt diff --git a/.github/workflows/site.yml b/.github/workflows/site.yml index 143a1ca..0841362 100644 --- a/.github/workflows/site.yml +++ b/.github/workflows/site.yml @@ -31,7 +31,8 @@ jobs: cd org make clean make - tree ../ + cd .. + ./patches/gmi.sh - name: Setup Pages uses: actions/configure-pages@v2 @@ -44,7 +45,7 @@ jobs: - name: Patch HTML run: | - tree _site + cd _site && tree sudo ./patches/icons.sh - name: Upload artifact diff --git a/.gitignore b/.gitignore index 1622e9e..83190c7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ *.html *.xml +*.gmi.txt !index.html !xmr.html !404.html diff --git a/gopher_collections.gmi.txt b/gopher_collections.gmi.txt deleted file mode 120000 index 599a1b0..0000000 --- a/gopher_collections.gmi.txt +++ /dev/null @@ -1 +0,0 @@ -gmi/gopher_collections.gmi \ No newline at end of file diff --git a/org/internet_collections.org b/org/internet_collections.org index 21dec67..0c505e9 100644 --- a/org/internet_collections.org +++ b/org/internet_collections.org @@ -8,6 +8,9 @@ #+DATE: <2022-06-05 日> * 一些(个人)博客收集 +:PROPERTIES: +:CUSTOM_ID: blog +:END: #+TAGS: rssable(s) rssub(u) gopher(g) #+BEGIN_SRC text _ ___ @@ -278,6 +281,9 @@ use the power of tor: 今年的新博客, 友链有踏浪 * YouTube 收集(没有账号, 这就是我的收藏夹) +:PROPERTIES: +:CUSTOM_ID: yt +:END: # I think the quality of DT's video is falling ** Computer Science *** [[https://tsoding.org][tsoding]] @@ -367,6 +373,9 @@ to filing patently fraudulent DMCA counter-notifications to avoid the terminatio *** [[https://youtu.be/k35uDHs7Z9E][DT: A Disturbing Descent Into The Mind Of A Mad Man]] * r +:PROPERTIES: +:CUSTOM_ID: r +:END: ** [[https://www.reddit.com/r/unixporn/][unixporn]] *** [[https://www.reddit.com/r/unixporn/comments/v6fsui/sway_family_reunionr/][reddit: family reunion]] *** [[https://www.reddit.com/r/unixporn/comments/wkba0x/jwm_if_i_had_a_pda/][pocket pc]] @@ -378,6 +387,9 @@ to filing patently fraudulent DMCA counter-notifications to avoid the terminatio *** [[https://www.reddit.com/r/ProgrammerHumor/comments/mr8gqx/new_episode_of_electricianhumor/][New episode of ElectricianHumor]] * Mail +:PROPERTIES: +:CUSTOM_ID: mail +:END: #+BEGIN_SRC text [[[ To any NSA and FBI agents reading my email: please consider ]]] [[[ whether defending the US Constitution against all enemies, ]]] @@ -389,6 +401,9 @@ to filing patently fraudulent DMCA counter-notifications to avoid the terminatio ** [[https://lists.gnu.org/archive/html/emacs-devel/2020-10/msg00376.html][Include leaf in Emacs distribution]] * Other +:PROPERTIES: +:CUSTOM_ID: misc +:END: #+BEGIN_COMMENT #+END_COMMENT ** [[https://en.wikipedia.org/wiki/Python_(missile)][Python-5]] diff --git a/org/publish_config.el b/org/publish_config.el index 9aa5c9b..56145fd 100644 --- a/org/publish_config.el +++ b/org/publish_config.el @@ -19,6 +19,7 @@ (require 'webfeeder)) ;; https://emacs.stackexchange.com/questions/36366/disable-auto-id-generation-in-org-mode-html-export +;; BUG: will cause toc not working, but I don't use much, so just add id manually (defun html-body-id-filter (output backend info) "Remove random ID attributes generated by Org." (when (eq backend 'html) diff --git a/patches/gmi.sh b/patches/gmi.sh new file mode 100755 index 0000000..9b767b0 --- /dev/null +++ b/patches/gmi.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +ls gmi | xargs -I {} ln -s gmi/{} {}.txt diff --git a/patches/icons.sh b/patches/icons.sh index aad0af8..fb7d8d4 100755 --- a/patches/icons.sh +++ b/patches/icons.sh @@ -1,7 +1,7 @@ #! /bin/sh # bili_ip -sed -i '6a ' _site/bili_ip.html +sed -i '6a ' bili_ip.html # magical index -sed -i '6a ' _site/internet_collections.html +sed -i '6a ' internet_collections.html diff --git a/re.gmi.txt b/re.gmi.txt deleted file mode 120000 index 6a220bb..0000000 --- a/re.gmi.txt +++ /dev/null @@ -1 +0,0 @@ -gmi/re.gmi \ No newline at end of file