Add support for running oclip from windows shell

Issue-ID: CLI-66

Change-Id: Id12759d0b7afcc29c6ee9d3f4c504925f09074c9
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile
index a12b226..3765d20 100644 (file)
--- a/deployment/docker/src/main/docker/Dockerfile
+++ b/deployment/docker/src/main/docker/Dockerfile
@@ -21,7 +21,6 @@ ENV OPEN_CLI_USERNAME guest
 ENV OPEN_CLI_PASSWORD guest
 
 ENV GOTTY_TITLE_FORMAT {{ .command }}
-ENV GOTTY_INDEX  $OPEN_CLI_HOME/http/web/occ.html
 
 #Copy CLI into docker
 ADD ./STAGE $OPEN_CLI_HOME

diff --git a/deployment/zip/src/main/release/bin/oclip.sh b/deployment/zip/src/main/release/bin/oclip.sh
index a3d5194..90fcfc5 100755 (executable)
--- a/deployment/zip/src/main/release/bin/oclip.sh
+++ b/deployment/zip/src/main/release/bin/oclip.sh
@@ -22,10 +22,17 @@ then
     exit 1
 fi
 
-CLASSPATH=$OPEN_CLI_HOME:$OPEN_CLI_HOME/conf:$OPEN_CLI_HOME/docs
+if [ "$OSTYPE" = "msys" ]
+then
+    SEP=\;
+else
+    SEP=:
+fi
+
+CLASSPATH=${OPEN_CLI_HOME}${SEP}${OPEN_CLI_HOME}/conf${SEP}${OPEN_CLI_HOME}/docs
 for entry in "$OPEN_CLI_HOME/lib"/*
 do
-  CLASSPATH=$CLASSPATH:$entry
+  CLASSPATH=${CLASSPATH}${SEP}${entry}
 done
 
 if [ "$OPEN_CLI_DEBUG" = "true" ]

diff --git a/main/src/main/java/org/onap/cli/main/OnapCli.java b/main/src/main/java/org/onap/cli/main/OnapCli.java
index 15f845b..67be81b 100644 (file)
--- a/main/src/main/java/org/onap/cli/main/OnapCli.java
+++ b/main/src/main/java/org/onap/cli/main/OnapCli.java
@@ -203,6 +203,7 @@ public class OnapCli {
                 String line = null;
 
                 while ((line = console.readLine()) != null) {
+                    line = line.trim();
                     if (OnapCliConstants.PARAM_INTERACTIVE_EXIT.equalsIgnoreCase(line)) {
                         break;
                     } else if (OnapCliConstants.PARAM_INTERACTIVE_CLEAR.equalsIgnoreCase(line)) {