Merge pull request #238 from xexyl/pandoc
This commit is contained in:
1 file changed
+14
-4
+14
-4
@@ -20,6 +20,8 @@
|
|||||||
#
|
#
|
||||||
# Copyright (c) 2023,2024 by Landon Curt Noll. All Rights Reserved.
|
# Copyright (c) 2023,2024 by Landon Curt Noll. All Rights Reserved.
|
||||||
#
|
#
|
||||||
|
# .. with an important bug fix in November 2025 by Cody Boone Ferguson.
|
||||||
|
#
|
||||||
# Permission to use, copy, modify, and distribute this software and
|
# Permission to use, copy, modify, and distribute this software and
|
||||||
# its documentation for any purpose and without fee is hereby granted,
|
# its documentation for any purpose and without fee is hereby granted,
|
||||||
# provided that the above copyright, this permission notice and text
|
# provided that the above copyright, this permission notice and text
|
||||||
@@ -143,6 +145,17 @@ if [[ $status -eq 0 ]]; then
|
|||||||
TOPDIR=$("$GIT_TOOL" rev-parse --show-toplevel)
|
TOPDIR=$("$GIT_TOOL" rev-parse --show-toplevel)
|
||||||
fi
|
fi
|
||||||
export TOPDIR
|
export TOPDIR
|
||||||
|
#
|
||||||
|
VERGE=$(type -P verge)
|
||||||
|
export VERGE
|
||||||
|
if [[ -z $VERGE ]]; then
|
||||||
|
echo "$0: FATAL: verge is not installed or not in \$PATH" 1>&2
|
||||||
|
echo "$0: notice: to install verge:" 1>&2
|
||||||
|
echo "$0: notice: run: git clone https://github.com/ioccc-src/mkiocccentry.git" 1>&2
|
||||||
|
echo "$0: notice: then: cd mkiocccentry && make clobber all" 1>&2
|
||||||
|
echo "$0: notice: then: cd jparse && sudo make install clobber" 1>&2
|
||||||
|
exit 5
|
||||||
|
fi
|
||||||
PANDOC_TOOL=$(type -P pandoc)
|
PANDOC_TOOL=$(type -P pandoc)
|
||||||
export PANDOC_TOOL
|
export PANDOC_TOOL
|
||||||
if [[ -z $PANDOC_TOOL ]]; then
|
if [[ -z $PANDOC_TOOL ]]; then
|
||||||
@@ -428,9 +441,7 @@ fi
|
|||||||
|
|
||||||
# verify that the pandoc version is >= the minimum version
|
# verify that the pandoc version is >= the minimum version
|
||||||
#
|
#
|
||||||
FIRST_VERSION=$(printf "%s\n%s" "$PANDOC_TOOL_VERSION" "$PANDOC_MIN_VERSION" | LC_ALL=C sort -V | head -1)
|
if ! "$VERGE" "$PANDOC_TOOL_VERSION" "$PANDOC_MIN_VERSION"; then
|
||||||
export FIRST_VERSION
|
|
||||||
if [[ $FIRST_VERSION != "$PANDOC_MIN_VERSION" ]]; then
|
|
||||||
echo "$0: ERROR: pandoc: $PANDOC_TOOL version: $PANDOC_TOOL_VERSION <=" \
|
echo "$0: ERROR: pandoc: $PANDOC_TOOL version: $PANDOC_TOOL_VERSION <=" \
|
||||||
"minimum allowed: $PANDOC_MIN_VERSION" 1>&2
|
"minimum allowed: $PANDOC_MIN_VERSION" 1>&2
|
||||||
echo "$0: Warning: pandoc version must be >= $PANDOC_MIN_VERSION" 1>&2
|
echo "$0: Warning: pandoc version must be >= $PANDOC_MIN_VERSION" 1>&2
|
||||||
@@ -438,7 +449,6 @@ if [[ $FIRST_VERSION != "$PANDOC_MIN_VERSION" ]]; then
|
|||||||
exit 5
|
exit 5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# execute pandoc
|
# execute pandoc
|
||||||
#
|
#
|
||||||
if [[ -z $NOOP ]]; then
|
if [[ -z $NOOP ]]; then
|
||||||
|
|||||||
Reference in new issue
Block a user