Changeset 32381 for main/trunk/greenstone3

Timestamp:

2018-08-29T19:11:30+12:00 (6 years ago)

Author:

ak19

Message:

Correction to running ant exec when passing a variable that optionanally has no value but empty string. Need to use arg line instead of arg value to ant exec in that case. When in testing mode, https.testing used to have the value minus-minus-staging. Now, when not in testing mode, https.testing having no value but running ant remove-/setup-cert-https works again using arg line.

File:

• main/trunk/greenstone3/build.xml (modified) (2 diffs)

main/trunk/greenstone3/build.xml

@@ -1619 +1619 @@
     <exec executable="./certbot-auto" dir="${basedir}/bin/${os.bin.dir}" failonerror="true" inputstring="Y">
      <arg value="revoke"/>
-     <arg value="${https.testing}"/>
+     <arg line="${https.testing}"/>
      <arg value="--cert-path"/><arg value="/etc/letsencrypt/live/${tomcat.server}/cert.pem"/>
     </exec>
@@ -1703 +1703 @@
     <arg value="./certbot-auto"/>
     <arg value="certonly"/>
-    <arg value="${https.testing}"/>
+    <arg line="${https.testing}"/><!-- https://stackoverflow.com/questions/11840284/pass-arguments-to-apache-ant-exec-task-based-on-the-variables-value -->
     <arg value="--standalone"/>
     <arg value="--non-interactive"/>