Updated Sentence tense, replaced deprecated wait_for_keypress. (#532)

==========================
Changed words to match sentence tense. 
==========================
Removed reference to depracated "wait_for_keypress", replaced with WaitForKeyPress, Ln 351. per https://github.com/CISOfy/lynis/blob/master/include/functions
==========================
Contribution by Justin McAfee  (me [at] justinmcafee [dot] com)
This commit is contained in:
Justin McAfee 2018-03-16 11:25:18 -05:00 committed by Michael Boelen
parent de75687e0a
commit 9bd0a92980

12
lynis
View File

@ -130,7 +130,7 @@ Make sure to execute ${PROGRAM_NAME} from untarred directory or check your insta
else else
MYID=$(id -u 2> /dev/null) MYID=$(id -u 2> /dev/null)
fi fi
if [ -z "${MYID}" ]; then Display "Could not find user ID with id command. Want to help improving Lynis? Raise a ticket at ${PROGRAM_SOURCE}"; ExitFatal; fi if [ -z "${MYID}" ]; then Display "Could not find user ID with id command. Want to help improve Lynis? Raise a ticket at ${PROGRAM_SOURCE}"; ExitFatal; fi
# #
################################################################################# #################################################################################
# #
@ -333,9 +333,9 @@ ${NORMAL}
${WARNING}Warning${NORMAL}: ${WHITE}PID file exists, probably another Lynis process is running.${NORMAL} ${WARNING}Warning${NORMAL}: ${WHITE}PID file exists, probably another Lynis process is running.${NORMAL}
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
If you are unsure another Lynis process is running currently, you are advised If you are unsure if another Lynis process is running currently, you are advised
to stop current process and check the process list first. If you cancelled to stop the current process and check the process list first. If you cancelled
(by using CTRL+C) a previous instance, you can ignore this message. a previous instance (by using CTRL+C), you can ignore this message.
You are advised to check for temporary files after program completion. You are advised to check for temporary files after program completion.
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
@ -348,7 +348,7 @@ ${YELLOW}Note: ${WHITE}Cancelling the program can leave temporary files behind${
echo "Quitting, to prevent multiple cron jobs running at the same time" echo "Quitting, to prevent multiple cron jobs running at the same time"
exit 1 # Manually exit, no cleanups to prevent deleting an active PID file exit 1 # Manually exit, no cleanups to prevent deleting an active PID file
else else
wait_for_keypress WaitForKeyPress
fi fi
# Deleting any stale PID files that might exist. Note: Display function does not work yet at this point # Deleting any stale PID files that might exist. Note: Display function does not work yet at this point
@ -555,7 +555,7 @@ ${NORMAL}
Display --indent 2 --text "- Detecting language and localization" --result "${LANGUAGE}" --color WHITE Display --indent 2 --text "- Detecting language and localization" --result "${LANGUAGE}" --color WHITE
if [ ! -f ${DBDIR}/languages/${LANGUAGE} ]; then if [ ! -f ${DBDIR}/languages/${LANGUAGE} ]; then
Display --indent 4 --text "${YELLOW}Notice:${NORMAL} no language file found for '${LANGUAGE}' (tried: ${DBDIR}/languages/${LANGUAGE})" Display --indent 4 --text "${YELLOW}Notice:${NORMAL} no language file found for '${LANGUAGE}' (tried: ${DBDIR}/languages/${LANGUAGE})"
if IsDeveloperVersion; then Display --indent 4 --text "See https://github.com/CISOfy/lynis-sdk/documentation/10-translations.md for more details to help translating Lynis"; fi if IsDeveloperVersion; then Display --indent 4 --text "See https://github.com/CISOfy/lynis-sdk/documentation/10-translations.md for more details to help translate Lynis"; fi
sleep 5 sleep 5
else else
LogText "Importing language file (${DBDIR}/languages/${LANGUAGE})" LogText "Importing language file (${DBDIR}/languages/${LANGUAGE})"