Skip to content

Use return codes for file_has_toc_code function #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NilsIrl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use return codes for file_has_toc_code function #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions internal/globals.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ function end_html {

function file_has_toc_code {
FILE="$1"
LINE_COUNT=$(strip_comments "${FILE}" | grep --ignore-case "${TOC_CODE}" | wc -l)
[[ "${LINE_COUNT}" > 0 ]] && echo "foobar" || echo ""
strip_comments "${FILE}" | grep --ignore-case "${TOC_CODE}" 2>/dev/null
}

function generate_id {
Expand Down Expand Up @@ -358,7 +357,7 @@ function get_title {

function get_toc {
FILE="$1"
[[ "$(file_has_toc_code "${FILE}")" == "" ]] && return
file_has_toc_code "${FILE}" || return
TEMP_HTML="$(mktemp)"
< "${FILE}" "${MARKDOWN}" ${MARKDOWN_FLAGS} > "${TEMP_HTML}"
HEADINGS=( )
Expand Down Expand Up @@ -757,11 +756,11 @@ function validate_options {
fi
# If user wants a TOC, then heading_ids must be unset or set to on.
# Set it to true if unset
[[ "$(file_has_toc_code "${FILE}")" != "" ]] && \
file_has_toc_code "${FILE}" && \
[[ "$(op_is_set "${OPTIONS}" heading_ids)" != "" ]] && \
[[ "$(op_get "${OPTIONS}" heading_ids)" == "0" ]] && \
echo "table of contents requested but heading_ids is off" && return 2
[[ "$(file_has_toc_code "${FILE}")" != "" ]] && op_set "${OPTIONS}" heading_ids
file_has_toc_code "${FILE}" && op_set "${OPTIONS}" heading_ids
return 0
}

Expand Down