various

- adopt reviewer suggestion
- support paths with spaces

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>

Author: andrewfg

distributions/openhab/src/main/resources/bin/karaf.bat

@@ -93,6 +93,11 @@ goto AFTER_CACHE_READY
 set CACHE_FOLDER=%KARAF_DATA%\cache\org.eclipse.osgi
 if exist "%CACHE_FOLDER%\.*" goto AFTER_CACHE_READY
 
+if not exist "%DIRNAME%runhidden.vbs" (
+    call :warn Missing helper script: "%DIRNAME%runhidden.vbs"
+    goto END
+)
+
 set CACHE_REFRESH_LOCK=%KARAF_DATA%\cache-refresh-lock
 if exist "%CACHE_REFRESH_LOCK%" goto AFTER_CACHE_READY
 type nul > "%CACHE_REFRESH_LOCK%"
@@ -105,14 +110,9 @@ set STOPPED_TARGET_LEVEL=0
 
 set RUNHIDDEN=wscript //nologo "%DIRNAME%runhidden.vbs"
 
-if not exist "%DIRNAME%runhidden.vbs" (
-    call :warn Missing helper script: "%DIRNAME%runhidden.vbs"
-    goto END
-)
-
 echo Starting server...
 set KARAF_HOME=
-%RUNHIDDEN% """%~dp0karaf.bat"" server"
+%RUNHIDDEN% "%DIRNAME%karaf.bat" "server"
 setlocal EnableDelayedExpansion
 set SECONDS_WAITED=0
 
@@ -138,7 +138,7 @@ endlocal
 
 echo Finalizing startup sequence...
 set KARAF_HOME=
-%RUNHIDDEN% """%~dp0karaf.bat"" stop"
+%RUNHIDDEN% "%DIRNAME%karaf.bat" "stop"
 setlocal EnableDelayedExpansion
 set SECONDS_WAITED=0
 

distributions/openhab/src/main/resources/bin/runhidden.vbs

@@ -1 +1 @@
-CreateObject("Wscript.Shell").Run WScript.Arguments(0), 0, False
+CreateObject("WScript.Shell").Run Chr(34) & WScript.Arguments(0) & Chr(34) & Chr(32) & WScript.Arguments(1), 0, False