From bdc6e8adf79907ac444800335a02c1a7667a6034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig-=C3=98rjan=20Smelror?= Date: Sat, 3 Feb 2024 18:17:10 +0100 Subject: [PATCH] _pages: Adding messages --- qsgen2 | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/qsgen2 b/qsgen2 index 8deeace..6cd8e23 100755 --- a/qsgen2 +++ b/qsgen2 @@ -411,15 +411,6 @@ function _pages() { if (${debug}) _msg debug "_pages: Replacing #pagetitle, #tagline and #sitename in pages_tpl" pages_tpl=$(echo "${pages_tpl}" | perl -pe "s|#pagetitle|${page_title}|gs; s|#tagline|${site_tagline}|gs; s|#sitename|${site_name}|gs") - # Insert the blog to the front page is blog_in_index is true and the file in the array is index.file_ext - # and if index.tmp.html exist and is not empty - if [[ ${pages_in_array} == "index.${file_ext}" && ${blog_in_index} == "true" && -s "${project_dir}/blog/index.tmp.html" ]]; then - _add_blog_list_to_index - else - _msg debug "Cannot find file ${project_dir}/blog/index.tmp.html" - continue - fi - # Replace every #tagline in pages_tpl #if (${debug}) _msg debug "_pages: Replacing tagline" #pages_tpl="${pages_tpl//#tagline/${site_tagline}}" @@ -446,6 +437,19 @@ function _pages() { # _msg std "Writing ${www_root}/${pages_title_lower%.*}.html to disk." echo "${pages_tpl}" > ${www_root}/${pages_title_lower%.*}.html + # Insert the blog to the front page is blog_in_index is true and the file in the array is index.file_ext + # and if index.tmp.html exist and is not empty + if [[ ${pages_in_array} == "index.${file_ext}" && ${blog_in_index} == "true" && -s "${project_dir}/blog/index.tmp.html" ]]; then + _msg sub "- Parsing ${pages_in_array}" + _msg sub "- blog_in_index = ${blog_in_index}" + _msg sub "- Listing blog temp file:" + ls -l ${project_dir}/blog/index.tmp.html + _add_blog_list_to_index + else + _msg debug "Cannot find file ${project_dir}/blog/index.tmp.html" + continue + fi + done export new_updated_pages=true