[Issue-160] Cherry pick fixes (#174)

* [Issue-160] Cherry pick fixes

* Update CHANGELOG

Author: Crim

CHANGELOG.md

@@ -26,7 +26,7 @@ If you run into issues, you can disable the new implementation and revert to the
 
 #### Bug fixes
 - [ISSUE-159](https://github.com/SourceLabOrg/kafka-webview/issues/159) Fix for file uploads in Windows environment.  Thanks for the contribution @[quentingodeau](https://github.com/quentingodeau)!
-
+- [ISSUE-160](https://github.com/SourceLabOrg/kafka-webview/issues/160) Fix startup scripts for Windows environment.  Thanks for the contribution @[quentingodeau](https://github.com/quentingodeau)!
 
 #### Internal Dependency Updates
 - Upgrade from Spring Boot 2.0.8 to 2.0.9

kafka-webview-ui/src/assembly/distribution/start.bat

@@ -1,5 +1,10 @@
-## Define configuration
+@echo off
+
+cd /D %~dp0
+
+:: Define configuration
 set SPRING_CONFIG_LOCATION=classpath:/config/base.yml,config.yml
 
-## launch webapp
-java -jar kafka-webview-ui-*.jar
+:: launch webapp
+FOR /F "tokens=* USEBACKQ" %%F IN (`dir /b kafka-webview-ui-*.jar`) DO SET "jar=%%F"
+java -jar %jar%

kafka-webview-ui/src/assembly/distribution/start.sh

@@ -17,7 +17,7 @@ fi
 export SPRING_CONFIG_LOCATION=classpath:/config/base.yml,config.yml
 
 ## launch webapp
-java -jar kafka-webview-ui-*.jar $HEAP_OPTS $LOG_OPTS
+exec java -jar kafka-webview-ui-*.jar $HEAP_OPTS $LOG_OPTS
 
 ## Change back to previous directory
 cd $CWD