From 3bd93e7f52109ecb0f3fb4ed426de3540d9b6b01 Mon Sep 17 00:00:00 2001 From: danix Date: Sat, 22 Apr 2023 09:53:42 +0200 Subject: cleanup of the output of the program. Updated README. --- SOURCE/CORE/helpers.sh | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) (limited to 'SOURCE/CORE/helpers.sh') diff --git a/SOURCE/CORE/helpers.sh b/SOURCE/CORE/helpers.sh index 38da28c..3f013f2 100644 --- a/SOURCE/CORE/helpers.sh +++ b/SOURCE/CORE/helpers.sh @@ -3,7 +3,7 @@ check_noteID() { IN=$1 case $IN in ''|*[!0-9]*) - return 1 + false ;; *) echo "$IN" @@ -29,29 +29,37 @@ helptext() { echo -e " -v | --version\t\t: Print version" echo -e " --userconf\t\t\t: Export User config file" echo -e " --backup []\t\t: Backup your data in your destination folder" + echo -e " --showconf\t\t\t: Display running options" + echo -e " --sync\t\t\t: Sync notes to git repository" echo "" echo -e "if a non option is passed and is a valid note ID, the note will be displayed." } configtext() { [ $USEGIT ] && GITUSE="enabled" || GITUSE="disabled" + if [ -n $GITCLIENT ]; then + CLIENTGIT="$( hostname )" + else + CLIENTGIT="$GITCLIENT" + fi clear echo -e "${BASENAME} configuration is:" - echo -e "base directory: ${BASEDIR}/" - echo -e "notes archive: ${NOTESDIR}/" - echo -e "notes database: ${DB}" - echo -e "rc file: $RCFILE" - echo -e "debug file: /tmp/debug_bash-note.log" - - echo -e "text editor: ${EDITOR}" - echo -e "terminal: ${TERMINAL}" - echo -e "jq executable: ${JQ}" - echo -e "PAGER: ${PAGER}" - - echo -e "GIT use: ${GITUSE}" - echo -e "GIT remote: ${GITREMOTE}" - echo -e "GIT sync delay: ${GITSYNCDELAY}" + echo -e "\tbase directory: ${BASEDIR}/" + echo -e "\tnotes archive: ${NOTESDIR}/" + echo -e "\tnotes database: ${DB}" + echo -e "\trc file: $RCFILE" + echo -e "\tdebug file: /tmp/debug_bash-note.log" + echo + echo -e "\ttext editor: ${EDITOR}" + echo -e "\tterminal: ${TERMINAL}" + echo -e "\tjq executable: ${JQ}" + echo -e "\tPAGER: ${PAGER}" + echo + echo -e "\tGIT: ${GITUSE} - ${GIT}" + echo -e "\tGIT remote: ${GITREMOTE}" + echo -e "\tGIT sync delay: ${GITSYNCDELAY}" + echo -e "\tGIT client name: ${CLIENTGIT}" } # this function returns a random 2 words title -- cgit v1.2.3