From: Ben Soares <bsoares@dundee.ac.uk>
Date: Mon, 10 Jun 2019 14:15:29 +0000 (+0100)
Subject: JAL-3248 quick fix for build.gradle when pandoc not available
X-Git-Tag: Release_2_11_0~7^2~8
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4d99a2909f440dbabd557eaa0635fb25416adb5c;hp=4660767b43e249085765847c67da1307ccff9168;p=jalview.git

JAL-3248 quick fix for build.gradle when pandoc not available
---

diff --git a/build.gradle b/build.gradle
index 3e5901b..9fbcd38 100644
--- a/build.gradle
+++ b/build.gradle
@@ -466,13 +466,17 @@ task convertBuildingMD(type: Exec) {
   def css = "$jalviewDir/$docDir/github.css"
 
   def pandoc = pandoc_exec
+  def hostname = "hostname".execute().text.trim()
   if (! file(pandoc).exists() && hostname.equals("jv-bamboo")) {
     pandoc = System.getProperty("user.home")+"/buildtools/pandoc/bin/pandoc"
   }
 
   if (file(pandoc).exists()) {
     commandLine pandoc, '-s', '-o', buildingHTML, '--metadata', 'pagetitle="Building Jalview from Source"', '--toc', '-H', css, buildingMD
+  } else {
+    commandLine "true"
   }
+
   ignoreExitValue true
 
   inputs.file(buildingMD)