aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-12-06 12:28:02 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-12-06 12:28:02 +0530
commit271cc28e5ad26cdc72db5b3b837545e717c6f225 (patch)
treeea61b29ef4444c2f9c276244c019ef57e73a6fae
parent0cb830f903d622674770684f8ea633c405bb7d6b (diff)
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>
-rw-r--r--deployment/docker/src/main/docker/Dockerfile1
-rwxr-xr-xdeployment/zip/src/main/release/bin/oclip.sh11
-rw-r--r--main/src/main/java/org/onap/cli/main/OnapCli.java1
3 files changed, 10 insertions, 3 deletions
diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile
index a12b2264..3765d205 100644
--- 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 a3d51940..90fcfc53 100755
--- 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 15f845b6..67be81bb 100644
--- 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)) {