Add support for custom options when launching the demo

jline · Apr 27, 2017 · 5463fd6 · 5463fd6
1 parent 32595a4
commit 5463fd6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/demo/jline-gogo.bat b/demo/jline-gogo.bat
@@ -59,13 +59,16 @@ if not exist %TARGETDIR%\lib\org.apache.felix.gogo.jline-%GOGO_JLINE_VERSION%.ja
 set cp=%cp%;%TARGETDIR%\lib\org.apache.felix.gogo.jline-%GOGO_JLINE_VERSION%.jar
 
 
-set opts=
+set "opts=%JLINE_OPTS%"
 :RUN_LOOP
     if "%1" == "jansi" goto :EXECUTE_JANSI
     if "%1" == "jna" goto :EXECUTE_JNA
     if "%1" == "debug" goto :EXECUTE_DEBUG
     if "%1" == "debugs" goto :EXECUTE_DEBUGS
-	goto :EXECUTE
+    if "%1" == "" goto :EXECUTE
+    set "opts=%opts% %~1"
+    shift
+    goto :RUN_LOOP
 
 :EXECUTE_JANSI
     set cp=%cp%;%TARGETDIR%/lib/jansi-%JANSI_VERSION%.jar
@@ -78,12 +81,12 @@ set opts=
     goto :RUN_LOOP
 
 :EXECUTE_DEBUG
-    set opts=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005
+    set "opts=%opts% -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005"
     shift
     goto :RUN_LOOP
 
 :EXECUTE_DEBUGS
-    set opts=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005
+    set "opts=%opts% -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"
     shift
     goto :RUN_LOOP
 

diff --git a/demo/jline-gogo.sh b/demo/jline-gogo.sh
@@ -84,7 +84,7 @@ if [ ! -f ${TARGETDIR}/lib/jna-${JNA_VERSION}.jar ] ; then
   wget -O ${TARGETDIR}/lib/jna-${JNA_VERSION}.jar http://repo1.maven.org/maven2/net/java/dev/jna/jna/${JNA_VERSION}/jna-${JNA_VERSION}.jar
 fi
 
-opts=""
+opts="${JLINE_OPTS}"
 while [ "${1}" != "" ]; do
     case ${1} in
         'debug')
@@ -107,6 +107,10 @@ while [ "${1}" != "" ]; do
             cp=$cp:${TARGETDIR}/lib/sshd-core-${SSHD_VERSION}.jar:${TARGETDIR}/lib/slf4j-api-${SLF4J_VERSION}.jar:${TARGETDIR}/lib/slf4j-jdk14-${SLF4J_VERSION}.jar
             shift
             ;;
+         *)
+             opts="${opts} ${1}"
+             shift
+             ;;
     esac
 done