From 5bb8298d670fa81f781a95be2b0f5441d60d3577 Mon Sep 17 00:00:00 2001 From: Cyrille L Date: Sat, 5 Mar 2022 18:18:46 +0100 Subject: [PATCH] Update Make Proceess and some converters --- var/lib/gsl/scripts/gsl__db_manager | 1 - var/lib/gsl/scripts/gsl__do_commons | 3 +-- var/lib/gsl/scripts/gsl__page_creator | 4 ++-- var/lib/gsl/scripts/gsl__post_makers | 4 ++-- var/lib/gsl/scripts/gsl__post_manager | 4 ++-- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/var/lib/gsl/scripts/gsl__db_manager b/var/lib/gsl/scripts/gsl__db_manager index 83bbf1c..5e2ba13 100644 --- a/var/lib/gsl/scripts/gsl__db_manager +++ b/var/lib/gsl/scripts/gsl__db_manager @@ -116,7 +116,6 @@ fi touch "$gsl_file_db_post" # Check webserver files -gsl__page_prepare_datas [[ -f $gsl_srv_wip_page ]] \ && gsl_process=wip diff --git a/var/lib/gsl/scripts/gsl__do_commons b/var/lib/gsl/scripts/gsl__do_commons index 81d4d45..d5e6cbc 100644 --- a/var/lib/gsl/scripts/gsl__do_commons +++ b/var/lib/gsl/scripts/gsl__do_commons @@ -167,8 +167,7 @@ case "$1" in ;; "make") - echo - echo "Converting icodes..." + echo -ne "\r\033[2K: Converting icodes..." gsl_html_icode_o="" gsl_html_icode_c="" diff --git a/var/lib/gsl/scripts/gsl__page_creator b/var/lib/gsl/scripts/gsl__page_creator index c9d2799..075067e 100644 --- a/var/lib/gsl/scripts/gsl__page_creator +++ b/var/lib/gsl/scripts/gsl__page_creator @@ -42,7 +42,7 @@ done # Get Datas for Post/Page #---------------------------------------------------------------------- gsl__page_prepare_datas() { -echo "D> $gsl_this_conf_domain" +#echo "D> $gsl_this_conf_domain" # Source config website (DATAS) source "$gsl_this_conf_domain/$gsl_find_domain.conf" @@ -247,7 +247,7 @@ EOFOOTER # Check for files in templates folder #----------------------------------------------------------------------- gsl__check_templates() { -echo "D> $gsl_dir_domain_tpl" +#echo "D> $gsl_dir_domain_tpl" # Create generic HEADER if not exists ! [[ "$gsl_dir_domain_tpl/header.html" ]] \ && gsl__html_header diff --git a/var/lib/gsl/scripts/gsl__post_makers b/var/lib/gsl/scripts/gsl__post_makers index 3a9bcfa..a2e2ec8 100644 --- a/var/lib/gsl/scripts/gsl__post_makers +++ b/var/lib/gsl/scripts/gsl__post_makers @@ -43,14 +43,14 @@ gsl__make_paragraphs gsl__check_cites gsl__make_a11y echo -ne "\r\033[2K" + rm -f "$gsl_tmp_post" # No more Needed tmp file post # Create HTML Page using gsl_a11y_post # cat "$gsl_a11y_post" gsl__page_creator -# No more Needed a11y post -rm -f "$gsl_a11y_post" +rm -f "$gsl_a11y_post" # No more Needed a11y post } #======================================================================= diff --git a/var/lib/gsl/scripts/gsl__post_manager b/var/lib/gsl/scripts/gsl__post_manager index ea61c60..015a3cb 100644 --- a/var/lib/gsl/scripts/gsl__post_manager +++ b/var/lib/gsl/scripts/gsl__post_manager @@ -62,8 +62,8 @@ do make) gsl_process="wip" - gsl__db_compare_post_hash && continue - + gsl__page_prepare_datas + case "$gsl_db_post_status" in chk) gsl__all_makers