From eebf0916e20c30ce3117b8895d4594c55194892a Mon Sep 17 00:00:00 2001 From: Cyrille L Date: Sun, 6 Mar 2022 16:28:29 +0100 Subject: [PATCH] Fix: README, bugs around help --- usr/local/bin/gsl | 21 +++++++-------------- var/lib/gsl/README.md | 2 +- var/lib/gsl/helps/gsl_help | 12 +++++++++--- var/lib/gsl/scripts/gsl__tools | 7 ++++--- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/usr/local/bin/gsl b/usr/local/bin/gsl index 8018d8f..c8661b8 100755 --- a/usr/local/bin/gsl +++ b/usr/local/bin/gsl @@ -223,16 +223,13 @@ case "$1" in ;; readme) - if [[ -f "/var/lib/gsl/README.md" ]];then - clear - cat /var/lib/gsl/README.md - else - echo "! Missing file: /var/lib/gsl/README.md" - fi + gsl__if_file "/var/lib/gsl/README.md" + clear + cat /var/lib/gsl/README.md ;; help|--help|-h) - gsl__check_file "$gsl_dir_helps/gsl_help" || exit 1 + gsl__if_file "$gsl_dir_helps/gsl_help" clear case "$2" in @@ -240,21 +237,17 @@ case "$1" in cat "$gsl_dir_helps/gsl_help" ;; new) - gsl__check_file "$gsl_dir_helps/gsl_infos_new_website" || exit 1 + gsl__if_file "$gsl_dir_helps/gsl_infos_new_website" cat "$gsl_dir_helps/gsl_infos_new_website" ;; install) - gsl__check_file "$gsl_dir_helps/gsl_help_install" || exit 1 + gsl__if_file "$gsl_dir_helps/gsl_help_install" cat "$gsl_dir_helps/gsl_help_install" ;; write|-w) - gsl__check_file "$gsl_dir_helps/gsl_help_write_post" || exit 1 + gsl__if_file "$gsl_dir_helps/gsl_help_write_post" cat "$gsl_dir_helps/gsl_help_write_post" ;; - stats) - gsl__check_file "$gsl_dir_helps/gsl_help_stats" || exit 1 - cat "$gsl_dir_helps/gsl_help_stats" - ;; esac ;; esac diff --git a/var/lib/gsl/README.md b/var/lib/gsl/README.md index 776656a..cc50c45 100644 --- a/var/lib/gsl/README.md +++ b/var/lib/gsl/README.md @@ -117,7 +117,7 @@ You will have to create some CSS (styles.css) in your /DOMAIN/templates/ ------------------------------------------------------------------------ Post has 2 sections : Before and After #1. #1 is the FIRST Title of your -post. #(1-6) are HTML titles (

to

). +post. #(1-6) are HTML titles. - Before #1 is used to set METAs HEADERS to configure your Post. - From #1 is the CONTENT of your Post diff --git a/var/lib/gsl/helps/gsl_help b/var/lib/gsl/helps/gsl_help index 79912c8..e4ce497 100644 --- a/var/lib/gsl/helps/gsl_help +++ b/var/lib/gsl/helps/gsl_help @@ -2,10 +2,10 @@ $ gsl [ARG] readme : Show README.md instructions - help | -h [OPT] : This Help. Add FULL [ARG] for specifics + help | -h [OPT] : This Help install : Show process installation + new : Adding a DOMAIN write | -w : How to write a Post - stats : What are thes numbers in stats DB ? new | -N : Add and configure a new DOMAIN @@ -20,6 +20,12 @@ $ gsl [ARG] add : Add author(s) for DOMAIN remove : Remove author(s) for DOMAIN - check | -C [OPT] [FILE] : Check Posts erors from PWD folder or [FILE] + check | -C [OPT] [FILE] : Check Posts errors from PWD folder or [FILE] -F : Force check again + + make | -M [OPT] [FILE] : Convert Posts from PWD folder or [FILE] + to HTML file in server + + post-list [FILE] : Add back post from [FILE] to Last-Posts List + (When converting new post, it will be added) diff --git a/var/lib/gsl/scripts/gsl__tools b/var/lib/gsl/scripts/gsl__tools index 4885f32..ad7cf28 100644 --- a/var/lib/gsl/scripts/gsl__tools +++ b/var/lib/gsl/scripts/gsl__tools @@ -12,16 +12,17 @@ if [[ -f "$1" ]];then source "$1" else echo "! Missing file: $1" - return 1 + exit 1 fi } #======================================================================= # Tool: Check needed file #======================================================================= -gsl__check_file() { +gsl__if_file() { if ! [[ -f "$1" ]];then - return + echo "! Missing $1" + exit 1 fi }