ideclon
/
bashblog
forked from team/bashblog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Use CGI for Gemini and various style and syntax changes' (#3) from nytpu/bashblog:master into master

This commit is contained in:
Ben Harris 2020-05-26 19:13:02 -04:00
parent 6d4be1d23d 5f93c05f07
commit 561d8950d3
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
bb.sh
View File

@ -61,7 +61,6 @@ global_variables() {
gophermap="gophermap" gophermap="gophermap"
# ignore gemini generation script and gemini index # ignore gemini generation script and gemini index
gemini_script="generate_gemini.sh"
gemini_index="index.gmi" gemini_index="index.gmi"
# Non blogpost files. Bashblog will ignore these. Useful for static pages and custom content # Non blogpost files. Bashblog will ignore these. Useful for static pages and custom content
@ -325,7 +324,7 @@ is_boilerplate_file() {
done done
case $name in 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 ;; return 0 ;;
( * ) # Check for excluded ( * ) # Check for excluded
for excl in "${html_exclude[@]}"; do for excl in "${html_exclude[@]}"; do
@ -864,17 +863,17 @@ make_gophermap() {
ln -s "${HOME}/public_html/blog/" "${HOME}/public_gopher/blog" ln -s "${HOME}/public_html/blog/" "${HOME}/public_gopher/blog"
fi fi
if [ ! -f "${HOME}/public_gopher/blog/gophermap" ]; then if [ ! -f "${HOME}/public_gopher/blog/$gophermap" ]; then
cat <<- 'EOF' > $HOME/public_html/blog/gophermap cat <<- 'EOF' > $HOME/public_html/blog/$gophermap
#!/bin/bash #!/usr/bin/env sh
echo -e "my bashblog posts\n" printf "my bashblog posts\n"
user=$(stat -c '%U' .) user=$(stat -c '%U' .)
for post in $(ls -t *.md); do for post in $(ls -t *.md); do
post=$(basename $post) post=$(basename $post)
echo -e "0$post\t/~$user/blog/$post\ttilde.team\t70" printf "0$post\t/~$user/blog/$post\ttilde.team\t70\n"
done done
EOF EOF
chmod +x $HOME/public_html/blog/gophermap chmod +x $HOME/public_html/blog/$gophermap
fi fi
chmod 644 *.md chmod 644 *.md
} }
@ -889,22 +888,19 @@ make_gemini() {
ln -s "${HOME}/public_html/blog/" "${HOME}/public_gopher/blog" ln -s "${HOME}/public_html/blog/" "${HOME}/public_gopher/blog"
fi fi
if [ ! -f "${HOME}/public_gemini/blog/generate_gemini.sh" ]; then if [ ! -f "${HOME}/public_gemini/blog/$gemini_index" ]; then
cat <<- 'EOF' > $HOME/public_gemini/blog/generate_gemini.sh cat <<- 'EOF' > $HOME/public_gemini/blog/$gemini_index
#!/bin/bash #!/usr/bin/env sh
echo -e "my bashblog posts\n" printf "20 text/gemini\r\n"
user=$(stat -c '%U' .) printf "my bashblog posts\r\n"
for post in $(ls -t *.md); do user=$(stat -c '%U' $0)
for post in $(ls -t /home/$user/public_gemini/blog/*.md); do
post=$(basename $post) post=$(basename $post)
echo -e "=> /~$user/blog/$post $post" printf "=> /~$user/blog/$post $post\r\n"
done done
EOF EOF
chmod +x ${HOME}/public_gemini/blog/generate_gemini.sh chmod +x ${HOME}/public_gemini/blog/$gemini_index
fi fi
echo -n "Generating gemini index "
${HOME}/public_gemini/blog/generate_gemini.sh > index.gmi
echo ""
} }
# generate headers, footers, etc # generate headers, footers, etc