From a2b7f9e5139420ad242a8d7dbed1303cf2c726c5 Mon Sep 17 00:00:00 2001 From: ~nytpu Date: Tue, 26 May 2020 18:50:59 -0400 Subject: [PATCH] Modified gemini to use CGI --- bb.sh | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/bb.sh b/bb.sh index 89077c1..82f3858 100755 --- a/bb.sh +++ b/bb.sh @@ -61,7 +61,6 @@ global_variables() { gophermap="gophermap" # ignore gemini generation script and gemini index - gemini_script="generate_gemini.sh" gemini_index="index.gmi" # Non blogpost files. Bashblog will ignore these. Useful for static pages and custom content @@ -325,7 +324,7 @@ is_boilerplate_file() { done case $name in - ( "$index_file" | "$archive_index" | "$gophermap" | "$gemini_index" | "$gemini_script" | "$tags_index" | "$footer_file" | "$header_file" | "$global_analytics_file" | "$prefix_tags"* ) + ( "$index_file" | "$archive_index" | "$gophermap" | "$gemini_index" | "$tags_index" | "$footer_file" | "$header_file" | "$global_analytics_file" | "$prefix_tags"* ) return 0 ;; ( * ) # Check for excluded for excl in "${html_exclude[@]}"; do @@ -889,22 +888,19 @@ make_gemini() { ln -s "${HOME}/public_html/blog/" "${HOME}/public_gopher/blog" fi - if [ ! -f "${HOME}/public_gemini/blog/generate_gemini.sh" ]; then - cat <<- 'EOF' > $HOME/public_gemini/blog/generate_gemini.sh + if [ ! -f "${HOME}/public_gemini/blog/$gemini_index" ]; then + cat <<- 'EOF' > $HOME/public_gemini/blog/$gemini_index #!/bin/bash - echo -e "my bashblog posts\n" - user=$(stat -c '%U' .) - for post in $(ls -t *.md); do + printf "20 text/gemini\r\n" + printf "my bashblog posts\r\n" + user=$(stat -c '%U' $0) + for post in $(ls -t /home/$user/public_gemini/blog/*.md); do post=$(basename $post) - echo -e "=> /~$user/blog/$post $post" + printf "=> /~$user/blog/$post $post\r\n" done EOF - chmod +x ${HOME}/public_gemini/blog/generate_gemini.sh + chmod +x ${HOME}/public_gemini/blog/$gemini_index fi - - echo -n "Generating gemini index " - ${HOME}/public_gemini/blog/generate_gemini.sh > index.gmi - echo "" } # generate headers, footers, etc