Changeset 32381

Show
Ignore:
Timestamp:
29.08.2018 19:11:30 (11 months 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r32379 r32381  
    16191619    <exec executable="./certbot-auto" dir="${basedir}/bin/${os.bin.dir}" failonerror="true" inputstring="Y"> 
    16201620     <arg value="revoke"/> 
    1621      <arg value="${https.testing}"/> 
     1621     <arg line="${https.testing}"/> 
    16221622     <arg value="--cert-path"/><arg value="/etc/letsencrypt/live/${tomcat.server}/cert.pem"/> 
    16231623    </exec> 
     
    17031703    <arg value="./certbot-auto"/> 
    17041704    <arg value="certonly"/> 
    1705     <arg value="${https.testing}"/> 
     1705    <arg line="${https.testing}"/><!-- https://stackoverflow.com/questions/11840284/pass-arguments-to-apache-ant-exec-task-based-on-the-variables-value --> 
    17061706    <arg value="--standalone"/> 
    17071707    <arg value="--non-interactive"/>