Make oclip.sh from onap.sh

Issue-Id: CLI-66

Change-Id: I88345b358c70c3f9048bea1ac7a34a5263e970c4
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 b0f1cf3..777e3ac 100644 (file)
--- a/deployment/docker/src/main/docker/Dockerfile
+++ b/deployment/docker/src/main/docker/Dockerfile
@@ -26,8 +26,8 @@ WORKDIR $OPEN_CLI_HOME
 
 #Setup the run time environment (RTE)
 #RTE: CLI
-RUN chmod +x ./bin/onap.sh  && \
-     ln ./bin/onap.sh /usr/sbin/onap  && \
+RUN chmod +x ./bin/oclip.sh  && \
+     ln ./bin/oclip.sh /usr/sbin/onap  && \
      if [ ! -d ./data ]; then mkdir ./data; fi  && \
      if [ ! -d ./onap-cli-schema ]; then mkdir ./onap-cli-schema; fi
 

diff --git a/deployment/zip/installer/install.sh b/deployment/zip/installer/install.sh
index 177656a..f98198f 100644 (file)
--- a/deployment/zip/installer/install.sh
+++ b/deployment/zip/installer/install.sh
@@ -47,10 +47,10 @@ wget -O $CLI_ZIP $CLI_LATEST_BINARY
 unzip $CLI_ZIP
 if [ ! -d ./data ]; then mkdir ./data; fi
 if [ ! -d ./open-cli-schema ]; then mkdir ./open-cli-schema; fi
-chmod +x ./bin/onap.sh
+chmod +x ./bin/oclip.sh
 
 #Make onap available in path
-ln ./bin/onap.sh $CLI_BIN
+ln ./bin/oclip.sh $CLI_BIN
 
 #Print the version
 onap -v

diff --git a/deployment/zip/src/main/release/bin/onap.sh b/deployment/zip/src/main/release/bin/oclip.sh
similarity index 100%
rename from deployment/zip/src/main/release/bin/onap.sh
rename to deployment/zip/src/main/release/bin/oclip.sh

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 5123a95..eb4e1d4 100644 (file)
--- a/main/src/main/java/org/onap/cli/main/OnapCli.java
+++ b/main/src/main/java/org/onap/cli/main/OnapCli.java
@@ -307,7 +307,7 @@ public class OnapCli {
                     OnapCliConstants.PARAM_INTERACTIVE_UNSET,
                     OnapCliConstants.PARAM_INTERACTIVE_PROFILE);
             console.addCompleter(strCompleter);
-            console.setPrompt(OnapCliConstants.PARAM_INTERACTIVE_PROMPT);
+            console.setPrompt(OnapCliConstants.PARAM_INTERACTIVE_PROMPT + ":" + OnapCommandRegistrar.getRegistrar().getEnabledProductVersion() + ">");
         } catch (OnapCommandException e) { // NOSONAR
             this.print("Failed to load onap commands," + e.getMessage());
         }

diff --git a/main/src/main/java/org/onap/cli/main/conf/OnapCliConstants.java b/main/src/main/java/org/onap/cli/main/conf/OnapCliConstants.java
index d28b984..c4a2161 100644 (file)
--- a/main/src/main/java/org/onap/cli/main/conf/OnapCliConstants.java
+++ b/main/src/main/java/org/onap/cli/main/conf/OnapCliConstants.java
@@ -30,7 +30,7 @@ public final class OnapCliConstants {
     public static final int EXIT_SUCCESS = 0;
     public static final int EXIT_FAILURE = 1;
 
-    public static final String PARAM_INTERACTIVE_PROMPT = "onap>";
+    public static final String PARAM_INTERACTIVE_PROMPT = "oclip";
     public static final String PARAM_INTERACTIVE_EXIT = "exit";
     public static final String PARAM_INTERACTIVE_EXIT_MSG = "To exit from the session.";
     public static final String PARAM_INTERACTIVE_CLEAR = "clear";