From 295c335182cd8cd84f5f35e31140202caba24d84 Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Mon, 1 Mar 2021 13:09:07 -0700 Subject: [PATCH] config: remove xmllint_readme option The `xmllint` tool no longer constrains checking of the README data. It's always checked now courtesy of the Markdown module. Remove the $Girocco::Config::xmllint_readme option from the config and remove the check for the `xmllint` tool during installation if that option has been set to a true value. Signed-off-by: Kyle J. McKay --- Girocco/Config.pm | 6 ------ install.sh | 7 ------- 2 files changed, 13 deletions(-) diff --git a/Girocco/Config.pm b/Girocco/Config.pm index 049bb00..4efc7e7 100644 --- a/Girocco/Config.pm +++ b/Girocco/Config.pm @@ -311,12 +311,6 @@ our $restrict_mirror_hosts = 1; # is always required when $restrict_mirror_hosts is enabled. our $min_dns_labels = 2; -# If $xmllint_readme is true then the contents of the README.html section -# will be passed through xmllint and any errors must be corrected before -# it can be saved. If this is set to true then xmllint must be in the $PATH. -# RECOMMENDED VALUE: 1 -our $xmllint_readme = 0; - # If defined, pass this value to format-readme as its `-m` option # When format-readme is formatting an automatic readme, it will skip # anything larger than this. The default is 32768 if unset. diff --git a/install.sh b/install.sh index 5be264b..effcc3e 100755 --- a/install.sh +++ b/install.sh @@ -140,13 +140,6 @@ if [ -n "$cfg_httpspushurl" ] && [ -z "$cfg_certsdir" ]; then fi -# Check for extra required tools -if [ "${cfg_xmllint_readme:-0}" != "0" ] && ! command -v xmllint >/dev/null; then - echo "ERROR: \$xmllint_readme set but xmllint not in \$PATH!" >&2 - exit 1 -fi - - echo "*** Checking for compiled utilities..." if ! [ -f src/can_user_push ] || ! [ -x src/can_user_push ]; then echo "ERROR: src/can_user_push is not built! Did you _REALLY_ read INSTALL?" >&2 -- 2.11.4.GIT