From 87d40ab61a678176eb31617a758a7ca4eb4bdb05 Mon Sep 17 00:00:00 2001 From: Bradley Sepos Date: Fri, 24 Mar 2017 18:21:21 -0400 Subject: [PATCH] build: Update to marsh 0.2.9. Supports Discount Markdown's new version string format. --- marsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/marsh b/marsh index d726e380..9bece3f7 100755 --- a/marsh +++ b/marsh @@ -6,7 +6,7 @@ # https://github.com/bradleysepos/marsh NAME="marsh" -VERSION="0.2.8" +VERSION="0.2.9" SELF="${BASH_SOURCE[0]}" SELF_DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd -P) SELF_DIR="${SELF_DIR:-$(pwd)}" @@ -2049,7 +2049,7 @@ else DEPS_MISSING+=("${GIT}") fi if dependency_exists "${MARKDOWN}"; then - MARKDOWN_VERSION=$("${MARKDOWN%%\ *}" -V | head -n 1 | sed -E -e 's/^markdown: +discount +([0-9]+(\.[0-9]+(\.[0-9]+)?)?).*$/\1/') + MARKDOWN_VERSION=$("${MARKDOWN%%\ *}" -V | head -n 1 | sed -E -e 's/^markdown: +discount +(\(.+\) *)?([0-9]+(\.[0-9]+(\.[0-9]+)?)?).*$/\2/') [[ $(version "${MARKDOWN_VERSION:-}") -ge $(version "${MARKDOWN_VERSION_REQ}") ]] || DEPS_MISSING+=("${MARKDOWN}") else DEPS_MISSING+=("${MARKDOWN}")