diff options
| author | David <2069735+Marzal@users.noreply.github.com> | 2019-07-13 13:41:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-13 13:41:10 +0300 |
| commit | 2dcf816e867aed02ab113a5301e20aa05f01992c (patch) | |
| tree | 96a3c770ec44e90b1e99e83d9efb981be7abf3ca /include/helper_show | |
| parent | d916fb926a01aad81ab77124bbd19f3c1a54eaf0 (diff) | |
Prepend sed to discard '## ' in CHANGELOG.md
Since version 2.6.6 CHANGELOG.md has markdown formatting. This breaks the show changelog command.
This is a workaound to "fix" the issue without changing all the versions in CHANGELOG.md
Diffstat (limited to 'include/helper_show')
| -rw-r--r-- | include/helper_show | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/helper_show b/include/helper_show index 874b3e1b..0ef6af82 100644 --- a/include/helper_show +++ b/include/helper_show @@ -160,15 +160,15 @@ if [ $# -gt 0 ]; then if [ ! -z "${CHANGELOG}" ]; then LogText "Result: found changelog file: ${CHANGELOG}"; break; fi done if [ ! -z "${CHANGELOG}" ]; then - SEARCH=$(egrep "^${PROGRAM_NAME} ${SEARCH_VERSION}" ${CHANGELOG}) + SEARCH=$(sed 's/^## //' ${CHANGELOG} | grep -E "^${PROGRAM_NAME} ${SEARCH_VERSION}") if [ $? -eq 0 ]; then while read -r LINE; do if [ ${STARTED} -eq 0 ]; then - SEARCH=$(echo ${LINE} | egrep "^${PROGRAM_NAME} ${SEARCH_VERSION}") + SEARCH=$(echo ${LINE} | sed 's/^## //' | grep -E "^${PROGRAM_NAME} ${SEARCH_VERSION}") if [ $? -eq 0 ]; then STARTED=1; ${ECHOCMD} "${BOLD}${LINE}${NORMAL}"; fi else # Stop if we find the next Lynis version - SEARCH=$(echo ${LINE} | egrep "^${PROGRAM_NAME} [0-9]\.[0-9]\.[0-9]") + SEARCH=$(echo ${LINE} | sed 's/^## //' | grep -E "^${PROGRAM_NAME} [0-9]\.[0-9]\.[0-9]") if [ $? -eq 0 ]; then break else @@ -183,7 +183,7 @@ if [ $# -gt 0 ]; then ${ECHOCMD} "$0 lynis show changelog [version]" ${ECHOCMD} "" ${ECHOCMD} "${HEADER}${PROGRAM_NAME} versions:${NORMAL}" - SEARCH=$(egrep "^Lynis [0-9]\.[0-9]\.[0-9] " ${CHANGELOG} | awk '{print $2}' | sort -n) + SEARCH=$(sed 's/^## //' ${CHANGELOG} | grep -E "^Lynis [0-9]\.[0-9]\.[0-9] " | awk '{print $2}' | sort -n) ${ECHOCMD} ${SEARCH} ExitFatal fi |