From ef26f06a893e8f17b8a448cc73e15e2c02edb818 Mon Sep 17 00:00:00 2001 From: Derek Stevens Date: Thu, 16 Feb 2023 20:20:21 -0700 Subject: [PATCH] no colon in twtxt header, use config setting for deployment --- config.def.h | 36 ++++++++++++++++++------------------ deploy.sh | 2 +- main.c | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/config.def.h b/config.def.h index 26ea18b..4526c4f 100644 --- a/config.def.h +++ b/config.def.h @@ -1,27 +1,27 @@ /* clang-format off */ - -#define MAINCSS "/nilfm.css?v=20220119.0" -#define DOMAIN "https://nilfm.cc" -#define LEXICON_SIZE 1024 -#define TWTXT "/twtxt.txt" #define SITEMAP "all_pages" -#define FRONTCSS "/nilfm.css?v=20220119.0" +#define DOMAIN "https://nilfm.cc" +#define DEPLOY_DEST "nilix@nilfm.cc:~/lib/nilfm/" +#define TAG_BODY_SIZE 4096 +#define LOGO_HTML "blackhole://nilFM" +#define MAINCSS "/nilfm.css?v=20220119.0" +#define FOOTER_HTML "
nilFM hack lab \n" \ +"honk \n" \ +"xxiivv webring \n" \ +"lightcrystal.systems \n" \ +"" +#define LICENSE_HTML "legal stuff
" +#define DESC "lair of drkste aka nilix: software artisan, digital philosopher" +#define IS_NAV_IN_HEADER 01 +#define LEXICON_SIZE 1024 #define CONTACT_HTML "contact: nilix@nilfm.cc
9058 7A74 0FA4 FFA0 9715 7538 3B7F BC22 144E 6398\n" \ "" -#define NAME "nilFM" -#define TAG_BODY_SIZE 4096 +#define FRONTCSS "/nilfm.css?v=20220119.0" +#define SITEROOT "../www/" +#define TWTXT "/twtxt.txt" #define ABOUT_HTML "Derek Stevens <nilix@nilfm.cc>
\n" \ "software artisan, digital philosopher

\n" \ "9058 7A74 0FA4 FFA0 9715 7538 3B7F BC22 144E 6398\n" \ "" -#define FOOTER_HTML "
nilFM hack lab \n" \ -"honk \n" \ -"xxiivv webring \n" \ -"lightcrystal.systems \n" -#define LICENSE_HTML "legal stuff
" -#define LOGO_HTML "blackhole://nilFM" -#define DESC "lair of drkste aka nilix: software artisan, digital philosopher" -#define SITEROOT "../www/" -#define IS_NAV_IN_HEADER 1 - +#define NAME "nilFM" /* clang-format on */ diff --git a/deploy.sh b/deploy.sh index 18a3501..458f385 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,6 +1,6 @@ #!/bin/sh -DEST="nilix@lynx.uberspace.de:~/lib/nilfm/" +DEST=$(grep "#define DEPLOY_DEST" config.h | awk '{print $3}' | sed -e 's/"//g') if [ -z "$1" ]; then rsync -avK --delete ../ ${DEST} diff --git a/main.c b/main.c index 404a6e6..c96b980 100644 --- a/main.c +++ b/main.c @@ -77,7 +77,7 @@ int gettwtxt(FILE* f) { char *l, *d, *m; FILE* twtxt = fopen(SITEROOT TWTXT, "r"); - scat(buf, "

recent activity:

\n\n"); + scat(buf, "

recent activity

\n
\n"); if (!twtxt) { return 1; } else {