Merge branch 'master' of github.com:forge/roaster

forge · Feb 23, 2017 · 2fe7ff3 · 2fe7ff3
2 parents 0553511 + 27d1031
commit 2fe7ff3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dist/src/main/resources/bin/roaster b/dist/src/main/resources/bin/roaster
@@ -157,6 +157,6 @@ if $cygwin; then
 fi
 
 roaster_exec_cmd="\"$JAVACMD\" $ROASTER_DEBUG_ARGS $ROASTER_OPTS \"-Droaster.home=${ROASTER_HOME}\" \
-   -cp \"${ROASTER_HOME}/lib/*\" $ROASTER_MAIN_CLASS"
+   -cp \"${ROASTER_HOME}/lib/*:${ROASTER_HOME}\" $ROASTER_MAIN_CLASS"
 
 eval $roaster_exec_cmd "$QUOTED_ARGS"
diff --git a/dist/src/main/resources/bin/roaster.bat b/dist/src/main/resources/bin/roaster.bat
@@ -150,7 +150,7 @@ goto runRoaster
 
 set ROASTER_MAIN_CLASS=org.jboss.forge.roaster.Bootstrap
 %ROASTER_JAVA_EXE% %ROASTER_DEBUG_ARGS% %ROASTER_OPTS% "-Droaster.standalone=true" "-Droaster.home=%ROASTER_HOME%" ^
-   -cp ".;%ROASTER_HOME%\lib\*" %ROASTER_MAIN_CLASS% %ROASTER_CMD_LINE_ARGS%
+   -cp ".;%ROASTER_HOME%\lib\*;%ROASTER_HOME%" %ROASTER_MAIN_CLASS% %ROASTER_CMD_LINE_ARGS%
 if ERRORLEVEL 1 goto error
 goto end