From 1253319dcaba65d71e350fbd657784558d72f648 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Tue, 2 Jan 2024 08:55:43 +0200 Subject: [generate] Brough back hardlink fixing --- generate.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 9f3c681..a3f5ac8 100755 --- a/generate.sh +++ b/generate.sh @@ -5,6 +5,19 @@ : ${GEN_TINY_FOLDER:=./website.tiny} : ${AWK_FOLDER:=./awk-edits} +# 0 Fix hardlinks {{{ + while read -r folder + do + if [ -f "$folder.md" ] && [ ! "$folder.md" -ef "$folder/index.md" ] + then + rm "$folder/index.md" >/dev/null 2>&1 + ln "$folder.md" "$folder/index.md" + fi + done << EOF +$(find "$REPO_FOLDER/src" -maxdepth 1 -type d) +EOF + echo "[Stage 0] Fixed folder/index.md hardlinks" +# }}} # 1. Markdown source to HTML {{{ [ $# -eq 0 -a "$(id -u -n)" != "www-data" ] && echo "[Warning] Running in \"production\" by a user that isn't www-root!" -- cgit v1.3.1-26-gb76a From 4b79dcf1d706706899b6612f5dd1c2aed5153646 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sat, 15 Jun 2024 10:54:20 +0300 Subject: [favcon] Added favicon hardlink to / --- generate.sh | 5 +++++ src/favicon.ico | Bin 0 -> 38078 bytes 2 files changed, 5 insertions(+) create mode 100644 src/favicon.ico (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index a3f5ac8..7240951 100755 --- a/generate.sh +++ b/generate.sh @@ -16,6 +16,11 @@ done << EOF $(find "$REPO_FOLDER/src" -maxdepth 1 -type d) EOF + if [ ! "src/favicon.ico" -ef "src/img/favicon.ico" ] + then + rm "src/favicon.ico" >/dev/null 2>&1 + ln "src/img/favicon.ico" "src/favicon.ico" + fi echo "[Stage 0] Fixed folder/index.md hardlinks" # }}} # 1. Markdown source to HTML {{{ diff --git a/src/favicon.ico b/src/favicon.ico new file mode 100644 index 0000000..79143ba Binary files /dev/null and b/src/favicon.ico differ -- cgit v1.3.1-26-gb76a From e80e02cb52f4d7d67b257a5f72e7fbe28c5b74f9 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sat, 10 Aug 2024 15:31:25 +0300 Subject: feat!: Removed CSMA, made minor styling changes --- .gitmodules | 3 - awk-edits/Heading-anchors.awk | 2 +- csma | 1 - generate.sh | 14 +- src/_header.html | 34 +-- src/scripts/expand-navbar.js | 8 +- src/scripts/page-width.js | 4 +- src/styles.csma | 656 ------------------------------------------ src/styles.css | 498 ++++++++++++++++++++++++++++++++ 9 files changed, 524 insertions(+), 696 deletions(-) delete mode 160000 csma delete mode 100644 src/styles.csma create mode 100644 src/styles.css (limited to 'generate.sh') diff --git a/.gitmodules b/.gitmodules index b36ee4c..600c751 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "csg"] path = csg url = https://gitlab.com/Syndamia/csg.git -[submodule "csma"] - path = csma - url = https://gitlab.com/Syndamia/csma.git diff --git a/awk-edits/Heading-anchors.awk b/awk-edits/Heading-anchors.awk index 10f4aa9..7d4edf8 100644 --- a/awk-edits/Heading-anchors.awk +++ b/awk-edits/Heading-anchors.awk @@ -12,5 +12,5 @@ gap = "
" ORS } match($0, /id="[^"]*"/) - $0 = gap $0 ORS "§" + $0 = gap $0 ORS "#" } diff --git a/csma b/csma deleted file mode 160000 index a00471f..0000000 --- a/csma +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a00471ff2e26fa5f1cb6be4d9ba3d3dbdff0a578 diff --git a/generate.sh b/generate.sh index 7240951..43023af 100755 --- a/generate.sh +++ b/generate.sh @@ -31,17 +31,7 @@ EOF /usr/bin/env dash ./csg/csg "$REPO_FOLDER/src" "$GEN_FOLDER" '& \\— Syndamia' 'https://syndamia.com' "$AWK_FOLDER" # }}} -# 2. CSMA to CSS {{{ - echo "[Stage 3] CSMA" - while read -r stylesheet - do - /usr/bin/env -S awk -f './csma/csmap.awk' "$stylesheet" > "${stylesheet:0: -4}css" - rm "$stylesheet" - done << EOF -$(find "$GEN_FOLDER" -type f -name "*.csma") -EOF -# }}} -# 3. Tiny version, strip away styles and other stuff {{{ +# 2. Tiny version, strip away styles and other stuff {{{ [ ! -d "$GEN_TINY_FOLDER" ] && mkdir "$GEN_TINY_FOLDER" [ $# -eq 0 -a "$(stat -c %U "$GEN_TINY_FOLDER")" != "www-data" ] && echo "[Warning] Running in \"production\" while $GEN_TINY_FOLDER isn't owned by www-data!" @@ -63,7 +53,7 @@ EOF done } - echo "[Stage 4] Tiny website" + echo "[Stage 3] Tiny website" if [ $# -eq 0 ]; then improveForTINY diff --git a/src/_header.html b/src/_header.html index 817318c..16c1d00 100644 --- a/src/_header.html +++ b/src/_header.html @@ -25,7 +25,7 @@