diff --git a/src/main/java/org/dita/dost/platform/Integrator.java b/src/main/java/org/dita/dost/platform/Integrator.java index 44f8fef8b9..5007e34ffc 100644 --- a/src/main/java/org/dita/dost/platform/Integrator.java +++ b/src/main/java/org/dita/dost/platform/Integrator.java @@ -712,34 +712,34 @@ private void writeStartcmdShell(final Collection jars) { out.write( """ - #!/bin/sh - # Generated file, do not edit manually" - echo "NOTE: The startcmd.sh has been deprecated, use the 'dita' command instead." - - realpath() { - case $1 in - /*) echo "$1" ;; - *) echo "$PWD/${1#./}" ;; - esac - } - - if [ "${DITA_HOME:+1}" = "1" ] && [ -e "$DITA_HOME" ]; then - export DITA_DIR="$(realpath "$DITA_HOME")" - else #elif [ "${DITA_HOME:+1}" != "1" ]; then - export DITA_DIR="$(dirname "$(realpath "$0")")" - fi - - if [ -f "$DITA_DIR"/bin/ant ] && [ ! -x "$DITA_DIR"/bin/ant ]; then - chmod +x "$DITA_DIR"/bin/ant - fi - - export ANT_OPTS="-Xmx512m $ANT_OPTS" - export ANT_OPTS="$ANT_OPTS -Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl" - export ANT_HOME="$DITA_DIR" - export PATH="$DITA_DIR"/bin:"$PATH" - - NEW_CLASSPATH="$DITA_DIR/lib:$NEW_CLASSPATH" - """ + #!/bin/sh + # Generated file, do not edit manually" + echo "NOTE: The startcmd.sh has been deprecated, use the 'dita' command instead." + + realpath() { + case $1 in + /*) echo "$1" ;; + *) echo "$PWD/${1#./}" ;; + esac + } + + if [ "${DITA_HOME:+1}" = "1" ] && [ -e "$DITA_HOME" ]; then + export DITA_DIR="$(realpath "$DITA_HOME")" + else #elif [ "${DITA_HOME:+1}" != "1" ]; then + export DITA_DIR="$(dirname "$(realpath "$0")")" + fi + + if [ -f "$DITA_DIR"/bin/ant ] && [ ! -x "$DITA_DIR"/bin/ant ]; then + chmod +x "$DITA_DIR"/bin/ant + fi + + export ANT_OPTS="-Xmx512m $ANT_OPTS" + export ANT_OPTS="$ANT_OPTS -Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl" + export ANT_HOME="$DITA_DIR" + export PATH="$DITA_DIR"/bin:"$PATH" + + NEW_CLASSPATH="$DITA_DIR/lib:$NEW_CLASSPATH" + """ ); for (final File relativeLib : jars) { out.write("NEW_CLASSPATH=\""); @@ -751,15 +751,15 @@ private void writeStartcmdShell(final Collection jars) { } out.write( """ - if test -n "$CLASSPATH"; then - export CLASSPATH="$NEW_CLASSPATH":"$CLASSPATH" - else - export CLASSPATH="$NEW_CLASSPATH" - fi - - cd "$DITA_DIR" - "$SHELL" - """ + if test -n "$CLASSPATH"; then + export CLASSPATH="$NEW_CLASSPATH":"$CLASSPATH" + else + export CLASSPATH="$NEW_CLASSPATH" + fi + + cd "$DITA_DIR" + "$SHELL" + """ ); try { Files.setPosixFilePermissions(outFile.toPath(), PERMISSIONS); @@ -785,21 +785,21 @@ private void writeStartcmdBatch(final Collection jars) { out.write( """ - @echo off\r - REM Generated file, do not edit manually\r - echo "NOTE: The startcmd.bat has been deprecated, use the dita.bat command instead."\r - pause\r - \r - REM Get the absolute path of DITAOT's home directory\r - set DITA_DIR=%~dp0\r - \r - REM Set environment variables\r - set ANT_OPTS=-Xmx512m %ANT_OPTS%\r - set ANT_OPTS=%ANT_OPTS% -Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl\r - set ANT_HOME=%DITA_DIR%\r - set PATH=%DITA_DIR%\\bin;%PATH%\r - set CLASSPATH=%DITA_DIR%lib;%CLASSPATH%\r - """ + @echo off\r + REM Generated file, do not edit manually\r + echo "NOTE: The startcmd.bat has been deprecated, use the dita.bat command instead."\r + pause\r + \r + REM Get the absolute path of DITAOT's home directory\r + set DITA_DIR=%~dp0\r + \r + REM Set environment variables\r + set ANT_OPTS=-Xmx512m %ANT_OPTS%\r + set ANT_OPTS=%ANT_OPTS% -Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl\r + set ANT_HOME=%DITA_DIR%\r + set PATH=%DITA_DIR%\\bin;%PATH%\r + set CLASSPATH=%DITA_DIR%lib;%CLASSPATH%\r + """ ); for (final File relativeLib : jars) { out.write("set CLASSPATH=");