diff --git a/Scripts/Functions/Help/help.sh b/Scripts/Functions/Help/help.sh index 91acdb1..e2c8f1f 100755 --- a/Scripts/Functions/Help/help.sh +++ b/Scripts/Functions/Help/help.sh @@ -104,11 +104,9 @@ function help { # Verify number of arguments passed to centos-art.sh script. if [[ ${#ACTIONVALS[*]} -gt 2 ]];then - cli_printMessage "`gettext "Only two arguments are accepted."`" 'AsErrorLine' - cli_printMessage "${FUNCDIRNAME}" 'AsToKnowMoreLine' + cli_printMessage "`gettext "Only two arguments are accepted."`" --as-error-line elif [[ ${#ACTIONVALS[*]} -lt 2 ]];then - cli_printMessage "`gettext "Two arguments are required."`" 'AsErrorLine' - cli_printMessage "${FUNCDIRNAME}" 'AsToKnowMoreLine' + cli_printMessage "`gettext "Two arguments are required."`" --as-error-line fi # Define source location. @@ -186,8 +184,7 @@ function help { if [[ $ACTIONNAM =~ "^${FUNCNAM}_[A-Za-z]+$" ]];then eval $ACTIONNAM else - cli_printMessage "`gettext "A valid action is required."`" 'AsErrorLine' - cli_printMessage "${FUNCDIRNAM}" 'AsToKnowMoreLine' + cli_printMessage "`gettext "A valid action is required."`" --as-error-line fi # Commit changes from working copy to central repository only. diff --git a/Scripts/Functions/Help/help_copyEntry.sh b/Scripts/Functions/Help/help_copyEntry.sh index 7f7b70b..928f1ce 100755 --- a/Scripts/Functions/Help/help_copyEntry.sh +++ b/Scripts/Functions/Help/help_copyEntry.sh @@ -26,7 +26,7 @@ function help_copyEntry { # Print separator line. - cli_printMessage '-' 'AsSeparatorLine' + cli_printMessage '-' --as-separator-line local ENTRY_SRC="$ENTRY" local ENTRIES='' @@ -41,7 +41,7 @@ function help_copyEntry { # Copy main documentation entry. if [[ -a ${ENTRY_SRC} ]] && [[ ! -a ${ENTRY_DST} ]];then - cli_printMessage "${ENTRY_DST}" 'AsCreatingLine' + cli_printMessage "${ENTRY_DST}" --as-creating-line svn cp "${ENTRY_SRC}" "${ENTRY_DST}" --quiet fi @@ -51,7 +51,7 @@ function help_copyEntry { # Copy dependent documentation entries, if any. if [[ -d ${ENTRY_DIR}/${ENTRY_FILE} ]] && [[ ! -d ${ENTRY_DST} ]];then - cli_printMessage "${ENTRY_DST}" 'AsCreatingLine' + cli_printMessage "${ENTRY_DST}" --as-creating-line svn cp "${ENTRY_DIR}/${ENTRY_FILE}" "${ENTRY_DST}" --quiet fi @@ -62,10 +62,10 @@ function help_copyEntry { cli_printActionPreamble "${ENTRIES}" '' '' # Print separator line. - cli_printMessage '-' 'AsSeparatorLine' + cli_printMessage '-' --as-separator-line # Print action message. - cli_printMessage "Updating menus, nodes and cross-references." 'AsResponseLine' + cli_printMessage "Updating menus, nodes and cross-references." --as-response-line # Redefine ENTRY variable in order to update documentation # structure, taking recently created entries as reference. diff --git a/Scripts/Functions/Help/help_deleteEntry.sh b/Scripts/Functions/Help/help_deleteEntry.sh index 206fd52..15bb255 100755 --- a/Scripts/Functions/Help/help_deleteEntry.sh +++ b/Scripts/Functions/Help/help_deleteEntry.sh @@ -26,7 +26,7 @@ function help_deleteEntry { # Print separator line. - cli_printMessage '-' 'AsSeparatorLine' + cli_printMessage '-' --as-separator-line local ENTRY_SRC=${ENTRY} local ENTRIES='' @@ -70,14 +70,14 @@ function help_deleteEntry { # Verify exit status from subversion command to be sure everything # went well. Otherwhise stop script execution. if [[ $? -ne 0 ]];then - cli_printMessage "${FUNCDIRNAM}" 'AsToKnowMoreLine' + cli_printMessage "${FUNCDIRNAM}" --as-toknowmore-line fi # Print separator line. - cli_printMessage '-' 'AsSeparatorLine' + cli_printMessage '-' --as-separator-line # Print action message. - cli_printMessage "Updating menus, nodes and cross-references." 'AsResponseLine' + cli_printMessage "Updating menus, nodes and cross-references." '--as-response-line' # Process list of entries in order to update menus, nodes and # cross references. Since we are verifying entry status before diff --git a/Scripts/Functions/Help/help_editEntry.sh b/Scripts/Functions/Help/help_editEntry.sh index 0c0b924..a850a7d 100755 --- a/Scripts/Functions/Help/help_editEntry.sh +++ b/Scripts/Functions/Help/help_editEntry.sh @@ -26,15 +26,15 @@ function help_editEntry { # Print separator line. - cli_printMessage '-' 'AsSeparatorLine' + cli_printMessage '-' --as-separator-line # Verify chapter definition inside manual. if [[ ! -d $MANUAL_CHAPTER_DIR ]];then # Print confirmation question. cli_printMessage "`gettext "The following documentation chapter will be created:"`" - cli_printMessage "$MANUAL_CHAPTER_DIR" "AsResponseLine" - cli_printMessage "`gettext "Do you want to continue?"`" "AsYesOrNoRequestLine" + cli_printMessage "$MANUAL_CHAPTER_DIR" --as-response-line + cli_printMessage "`gettext "Do you want to continue?"`" --as-yesornorequest-line # Update manual chapter related files. help_updateChaptersFiles @@ -53,8 +53,8 @@ function help_editEntry { # Print confirmation question. cli_printMessage "`gettext "The following documentation section will be created:"`" - cli_printMessage "$ENTRY" "AsResponseLine" - cli_printMessage "`gettext "Do you want to continue?"`" "AsYesOrNoRequestLine" + cli_printMessage "$ENTRY" --as-response-line + cli_printMessage "`gettext "Do you want to continue?"`" --as-yesornorequest-line # Update chapter section related menu. help_updateMenu @@ -74,7 +74,7 @@ function help_editEntry { else # Print action message. - cli_printMessage "$ENTRY" 'AsUpdatingLine' + cli_printMessage "$ENTRY" --as-updating-line fi diff --git a/Scripts/Functions/Help/help_searchIndex.sh b/Scripts/Functions/Help/help_searchIndex.sh index 45aeded..1eb0439 100644 --- a/Scripts/Functions/Help/help_searchIndex.sh +++ b/Scripts/Functions/Help/help_searchIndex.sh @@ -30,12 +30,11 @@ function help_searchIndex { # So, when no value is passed through --filter option use top node # as default value for index-search. if [[ "$FLAG_FILTER" == '.+' ]];then - cli_printMessage "`gettext "Use the \\\`--filter' option to define the search pattern."`" 'AsErrorLine' - cli_printMessage "${FUNCDIRNAM}" 'AsToKnowMoreLine' + cli_printMessage "`gettext "Use the \\\"--filter\\\" option to define the search pattern."`" --as-error-line fi # Print action message. - cli_printMessage "${MANUAL_BASEFILE}.info.bz2" 'AsReadingLine' + cli_printMessage "${MANUAL_BASEFILE}.info.bz2" --as-reading-line # Execute info command to perform an index-search. /usr/bin/info --index-search="$FLAG_FILTER" --file=${MANUAL_BASEFILE}.info.bz2 diff --git a/Scripts/Functions/Help/help_searchNode.sh b/Scripts/Functions/Help/help_searchNode.sh index 4cd5270..0a3b296 100755 --- a/Scripts/Functions/Help/help_searchNode.sh +++ b/Scripts/Functions/Help/help_searchNode.sh @@ -26,7 +26,7 @@ function help_searchNode { # Print action message. - cli_printMessage "${MANUAL_BASEFILE}.info.bz2" 'AsReadingLine' + cli_printMessage "${MANUAL_BASEFILE}.info.bz2" --as-reading-line # Check entry inside documentation structure. If the entry # exits use the info reader to open the info file at the diff --git a/Scripts/Functions/Help/help_updateOutputFileInfo.sh b/Scripts/Functions/Help/help_updateOutputFileInfo.sh index 325f2e2..6e4ef9f 100755 --- a/Scripts/Functions/Help/help_updateOutputFileInfo.sh +++ b/Scripts/Functions/Help/help_updateOutputFileInfo.sh @@ -26,7 +26,7 @@ function help_updateOutputFileInfo { # Output action message. - cli_printMessage "${MANUAL_BASEFILE}.info.bz2" 'AsUpdatingLine' + cli_printMessage "${MANUAL_BASEFILE}.info.bz2" --as-updating-line # Update info file. /usr/bin/makeinfo ${MANUAL_BASEFILE}.texi --output=${MANUAL_BASEFILE}.info diff --git a/Scripts/Functions/Help/help_updateOutputFilePdf.sh b/Scripts/Functions/Help/help_updateOutputFilePdf.sh index a79bc4b..da151b1 100755 --- a/Scripts/Functions/Help/help_updateOutputFilePdf.sh +++ b/Scripts/Functions/Help/help_updateOutputFilePdf.sh @@ -26,7 +26,7 @@ function help_updateOutputFilePdf { # Output action message. - cli_printMessage "${MANUAL_BASEFILE}.pdf" 'AsUpdatingLine' + cli_printMessage "${MANUAL_BASEFILE}.pdf" --as-updating-line # Update plaintext output directory. /usr/bin/texi2pdf --quiet \ diff --git a/Scripts/Functions/Help/help_updateOutputFilePlaintext.sh b/Scripts/Functions/Help/help_updateOutputFilePlaintext.sh index dd0f6e9..725658c 100755 --- a/Scripts/Functions/Help/help_updateOutputFilePlaintext.sh +++ b/Scripts/Functions/Help/help_updateOutputFilePlaintext.sh @@ -26,7 +26,7 @@ function help_updateOutputFilePlaintext { # Output action message. - cli_printMessage "${MANUAL_BASEFILE}.txt.bz2" 'AsUpdatingLine' + cli_printMessage "${MANUAL_BASEFILE}.txt.bz2" --as-updating-line # Update plaintext output directory. /usr/bin/makeinfo --plaintext \ diff --git a/Scripts/Functions/Help/help_updateOutputFileXhtml.sh b/Scripts/Functions/Help/help_updateOutputFileXhtml.sh index f49065e..4d7150d 100755 --- a/Scripts/Functions/Help/help_updateOutputFileXhtml.sh +++ b/Scripts/Functions/Help/help_updateOutputFileXhtml.sh @@ -26,7 +26,7 @@ function help_updateOutputFileXhtml { # Output action message. - cli_printMessage "${MANUAL_BASEFILE}.xhtml.tar.bz2" 'AsUpdatingLine' + cli_printMessage "${MANUAL_BASEFILE}.xhtml.tar.bz2" --as-updating-line # Redefine manual base file to use just the file base name. local MANUAL_BASEFILE=$(basename "$MANUAL_BASEFILE") diff --git a/Scripts/Functions/Help/help_updateOutputFileXml.sh b/Scripts/Functions/Help/help_updateOutputFileXml.sh index fe8ce46..de6b717 100755 --- a/Scripts/Functions/Help/help_updateOutputFileXml.sh +++ b/Scripts/Functions/Help/help_updateOutputFileXml.sh @@ -26,7 +26,7 @@ function help_updateOutputFileXml { # Print action message. - cli_printMessage "${MANUAL_BASEFILE}.xml" 'AsUpdatingLine' + cli_printMessage "${MANUAL_BASEFILE}.xml" --as-updating-line # Update xml output format. /usr/bin/makeinfo --xml \ diff --git a/Scripts/Functions/Help/help_updateOutputFiles.sh b/Scripts/Functions/Help/help_updateOutputFiles.sh index bc5442a..09ebd2c 100755 --- a/Scripts/Functions/Help/help_updateOutputFiles.sh +++ b/Scripts/Functions/Help/help_updateOutputFiles.sh @@ -26,7 +26,7 @@ function help_updateOutputFiles { # Print separator line. - cli_printMessage '-' 'AsSeparatorLine' + cli_printMessage '-' --as-separator-line # Remove extension from manual's base file. This way it is # possible to reuse the same filename on different types of files.