From: hyunsik.noh <hyunsik.noh@samsung.com>
Date: Fri, 17 Jan 2014 08:32:10 +0000 (+0900)
Subject: CLI: Fix install script for new-common-cli
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F47%2F15247%2F1;p=sdk%2Ftools%2Fcli.git

CLI: Fix install script for new-common-cli
Signed-off-by: hyunsik.noh <hyunsik.noh@samsung.com>

Change-Id: Ibf7c8de107e9d45414db0dbe39c5348a0f2cab8b
---

diff --git a/package/new-common-cli.install.linux b/package/new-common-cli.install.linux
index 32b8b55..2bb4c86 100644
--- a/package/new-common-cli.install.linux
+++ b/package/new-common-cli.install.linux
@@ -4,9 +4,8 @@ TOOLS_PATH=${TIZEN_SDK_INSTALL_PATH}/tools
 CLI_PATH=${TOOLS_PATH}/ide/bin
 CLI_LOG_FILE=${TOOLS_PATH}/ide/ncli.log
 
-TIZEN_COMPLETION_PATH=/etc/bash_completion.d
 TIZEN_COMPLETION_SCRIPT=${CLI_PATH}/tizen-autocomplete
-#TIZEN_COMPLETION_LINK_PATH=/usr/bin/tizen
+TIZEN_COMPLETION_LINK_PATH=${CLI_PATH}/tizen
 TIZEN_NEWCLI_SH=${CLI_PATH}/tizen.sh
 SOURCE_TIZEN_COMPLETION="source ${TIZEN_COMPLETION_SCRIPT}"
 
@@ -22,7 +21,7 @@ sed -i "s:CLI_LIB_PATH:\"${CLI_LIB_PATH}\":g" ${TIZEN_COMPLETION_SCRIPT}
 sed -i "s:SPAWN_LIB_PATH:\"${SPAWN_LIB_PATH}\":g" ${TIZEN_COMPLETION_SCRIPT}
 sed -i "s:CLI_LOG_FILE:\"${CLI_LOG_FILE}\":g" ${LOG4J_CONFIG}
 
-#gksudo "ln -s ${TIZEN_NEWCLI_SH} ${TIZEN_COMPLETION_LINK_PATH}"
+ln -s ${TIZEN_NEWCLI_SH} ${TIZEN_COMPLETION_LINK_PATH}
 
 if [ -f "${BASH_RC}" ]; then
     if [ -z "$(grep "${SOURCE_TIZEN_COMPLETION}" "${BASH_RC}")" ]; then
@@ -32,7 +31,5 @@ else
     echo -e "\n# Enable programmable tizen cli auto completion features.\n""${SOURCE_TIZEN_COMPLETION}" >> "${BASH_RC}"
 fi
 
-source ${BASH_RC}
-
 exit 0
 
diff --git a/package/new-common-cli.install.windows b/package/new-common-cli.install.windows
index 57ceed6..b9d1cb9 100644
--- a/package/new-common-cli.install.windows
+++ b/package/new-common-cli.install.windows
@@ -1,10 +1,10 @@
 @echo off
 setlocal enabledelayedexpansion
-set TIZEN_SDK_INSTALL_PATH=${INSTALLED_PATH}
-set TOOLS_PATH=${TIZEN_SDK_INSTALL_PATH}\tools
-set CLI_LOG_FILE=${TOOLS_PATH}\ide\ncli.log
-set LOG_CONFIG_PATH=${TOOLS_PATH}\ide\conf-ncli
-set LOG4J_CONFIG=${LOG_CONFIG_PATH}\log4j-progress.xml
+set TIZEN_SDK_INSTALL_PATH=%INSTALLED_PATH%
+set TOOLS_PATH=%TIZEN_SDK_INSTALL_PATH%\tools
+set CLI_LOG_FILE=%TOOLS_PATH%\ide\ncli.log
+set LOG_CONFIG_PATH=%TOOLS_PATH%\ide\conf-ncli
+set LOG4J_CONFIG=%LOG_CONFIG_PATH%\log4j-progress.xml
 set old=CLI_LOG_FILE
 set new=%CLI_LOG_FILE%
 set oldfile=%LOG4J_CONFIG%