diff options
author | Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com> | 2017-10-05 20:39:30 +0530 |
---|---|---|
committer | Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com> | 2017-11-20 12:24:27 +0530 |
commit | 51a60f14821cb3ca54848e94694b3dda045fe666 (patch) | |
tree | 92932a3708710fe21a4b96461f5ef339f8c7102d | |
parent | 99bbd73b7a909bcf19741a52fe995f693a84fe7f (diff) |
Make oclip.sh from onap.sh
Issue-Id: CLI-66
Change-Id: I88345b358c70c3f9048bea1ac7a34a5263e970c4
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
-rw-r--r-- | deployment/docker/src/main/docker/Dockerfile | 4 | ||||
-rw-r--r-- | deployment/zip/installer/install.sh | 4 | ||||
-rwxr-xr-x | deployment/zip/src/main/release/bin/oclip.sh (renamed from deployment/zip/src/main/release/bin/onap.sh) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/onap/cli/main/OnapCli.java | 2 | ||||
-rw-r--r-- | main/src/main/java/org/onap/cli/main/conf/OnapCliConstants.java | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile index b0f1cf39..777e3ac8 100644 --- 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 177656a9..f98198f2 100644 --- 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 index e4a58502..e4a58502 100755 --- a/deployment/zip/src/main/release/bin/onap.sh +++ b/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 5123a958..eb4e1d40 100644 --- 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 d28b9849..c4a21614 100644 --- 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"; |