OPENDJ-1976 setup.bat doesn't work without 8.3 format

pvarga

17.52.2016 66559b44c732762778da937bfc689c289b3907c9

OPENDJ-1976 setup.bat doesn't work without 8.3 format

- Avoid using ~s (short file name) modifier in all bat files
- Quotes missing around reading instance.loc contents
- Missing "delims=" in for /f (_script-util.bat)
- Duplicate quotes on TEMP_LOG in start-ds and stop-ds

 opendj-server-legacy/resource/setup.bat

@@ -19,18 +19,18 @@

rem check that the path does not contain the ^% character which breaks
rem the batch files.
for %%i in (%~sf0) do set NON_ESCAPED=%%~dPsi..
set NON_ESCAPED=%~dp0..


FOR /F "tokens=1-2* delims=%%" %%1 IN ("%NON_ESCAPED%") DO (
if NOT "%%2" == "" goto invalidPath)

for %%i in (%~sf0) do set DIR_HOME=%%~dPsi.
set DIR_HOME=%~dp0.

set INSTALL_ROOT=%DIR_HOME%
set INSTANCE_DIR=
if exist "%INSTALL_ROOT%\instance.loc" (
  set /p INSTANCE_DIR=<%INSTALL_ROOT%\instance.loc
  set /p INSTANCE_DIR=<"%INSTALL_ROOT%\instance.loc"
) else (
set INSTANCE_DIR=.
)

 opendj-server-legacy/resource/uninstall.bat

@@ -16,12 +16,12 @@
rem Portions Copyright 2011-2012 ForgeRock AS.

setlocal
for %%i in (%~sf0) do set DIR_HOME=%%~dPsi.
set DIR_HOME=%~dp0.

set INSTALL_ROOT=%DIR_HOME%
set INSTANCE_DIR=
if exist "%INSTALL_ROOT%\instance.loc" (
  set /p INSTANCE_DIR=<%INSTALL_ROOT%\instance.loc
  set /p INSTANCE_DIR=<"%INSTALL_ROOT%\instance.loc"
) else (
set INSTANCE_DIR=.
)

 opendj-server-legacy/resource/upgrade.bat

@@ -19,11 +19,11 @@
set OPENDJ_INVOKE_CLASS="org.opends.server.tools.upgrade.UpgradeCli"
set SCRIPT_NAME=upgrade

for %%i in (%~sf0) do set DIR_HOME=%%~dPsi
set DIR_HOME=%~dp0
set INSTALL_ROOT=%DIR_HOME%
set INSTANCE_DIR=
if exist "%INSTALL_ROOT%\instance.loc" (
  set /p INSTANCE_DIR=<%INSTALL_ROOT%\instance.loc
  set /p INSTANCE_DIR=<"%INSTALL_ROOT%\instance.loc"
) else (
set INSTANCE_DIR=.
)
@@ -46,5 +46,5 @@
mkdir %DIR_CLASSES%

:end
for %%i in (%~sf0) do call "%%~dPsi\lib\_server-script.bat" %*
call "%~dp0\lib\_server-script.bat" %*