SDB: remove sudo commands when installing sdb

remove tsudo by setting autocomplete in user account

Change-Id: I925f8aeb3a18cb4f54176b967788b9892a7b1305
Signed-off-by: ho.namkoong <ho.namkoong@samsung.com>

diff --git a/package/.sdb-completion.bash b/package/.sdb-completion.bash
new file mode 100644 (file)
index 0000000..e98ad3d
--- /dev/null
+++ b/package/.sdb-completion.bash
@@ -0,0 +1,32 @@
+_sdb()
+{
+    #sdb path is defined in PATH environment variable
+    COMPREPLY=()
+#    cur="${COMP_WORDS[COMP_CWORD]}"
+    ARGS="autocomplete,${COMP_CWORD}"
+
+    local IFS=$','
+    for ((i=1; i < $((${COMP_CWORD} + 1)) ; i++))
+    do
+        #processing for echo options
+        if [ "${COMP_WORDS[i]}" == "-e" ]; then
+            convertedarg=-e
+        elif [ "${COMP_WORDS[i]}" == "-n" ]; then
+            convertedarg=-n
+        else
+            convertedarg=$(eval eval echo \$\{COMP_WORDS\[i\]\})
+        fi
+        ARGS="${ARGS}${IFS}${convertedarg}"
+    done
+
+    SDB_PATH=$(eval eval echo \$\{COMP_WORDS\[0\]\})
+
+    next=($("${SDB_PATH}" ${ARGS}))
+    local IFS=$'\n'
+    COMPREPLY=(${next})
+#    COMPREPLY=($(compgen -W "${next}" -- ${cur}))
+
+    return 0
+}
+
+complete -o filenames -F _sdb sdb

diff --git a/package/build.linux b/package/build.linux
index 8a06d8152b13e08b369c9033419a728f3ef33eaf..3ce5113c110a4899d8a4c426075e3c6b52dc8ee4 100755 (executable)
--- a/package/build.linux
+++ b/package/build.linux
@@ -66,8 +66,7 @@ install()
                        then
                                mkdir -p ${INSTALL_DIR}/data/tools
                                cp ${SRCDIR}/bin/* ${INSTALL_DIR}/data/tools/
-                               cp -f ${SRCDIR}/package/sdb-autocomplete ${INSTALL_DIR}/data/tools/
-                                cp -f ${SRCDIR}/package/sdb-sudocmds ${INSTALL_DIR}/data/tools/
+                               cp -f ${SRCDIR}/package/.sdb-completion.bash ${INSTALL_DIR}/data/tools/
                        fi
                fi
        done    

diff --git a/package/sdb-autocomplete b/package/sdb-autocomplete
deleted file mode 100644 (file)
index 634d2a3..0000000
--- a/package/sdb-autocomplete
+++ /dev/null
@@ -1,31 +0,0 @@
-_sdb()
-{
-    #sdb path is defined in PATH environment variable
-    SDB_BIN=sdb
-    COMPREPLY=()
-#    cur="${COMP_WORDS[COMP_CWORD]}"
-    ARGS="autocomplete,${COMP_CWORD}"
-
-    local IFS=$','
-    for ((i=1; i < $((${COMP_CWORD} + 1)) ; i++))
-    do
-        #processing for echo options
-        if [ "${COMP_WORDS[i]}" == "-e" ]; then
-            convertedarg=-e
-        elif [ "${COMP_WORDS[i]}" == "-n" ]; then
-            convertedarg=-n
-        else
-            convertedarg=$(eval eval echo \$\{COMP_WORDS\[i\]\})
-        fi
-        ARGS="${ARGS}${IFS}${convertedarg}"
-    done
-
-    next=($(${SDB_BIN} ${ARGS}))
-    local IFS=$'\n'
-    COMPREPLY=(${next})
-#    COMPREPLY=($(compgen -W "${next}" -- ${cur}))
-
-    return 0
-}
-
-complete -o filenames -F _sdb sdb

diff --git a/package/sdb-sudocmds b/package/sdb-sudocmds
deleted file mode 100755 (executable)
index 8ebb00b..0000000
--- a/package/sdb-sudocmds
+++ /dev/null
@@ -1,9 +0,0 @@
-INSTALLED_PATH=$1
-SDB_AC_NAME=sdb-autocomplete
-SDB_AC_SRC_PATH=${INSTALLED_PATH}/tools/${SDB_AC_NAME}
-SDB_AC_DST_PATH=/etc/bash_completion.d/${SDB_AC_NAME}
-SDB_NAME=sdb
-SDB_PATH=${INSTALLED_PATH}/tools/${SDB_NAME}
-
-mv -f ${SDB_AC_SRC_PATH} ${SDB_AC_DST_PATH}
-ln -sf ${SDB_PATH} /usr/bin/sdb

diff --git a/package/sdb.install.linux b/package/sdb.install.linux
index c87e9e70425ad686804c700eba0297638a0cdcaf..5e56579a29494af97ece913d9857e66172b7d726 100755 (executable)
--- a/package/sdb.install.linux
+++ b/package/sdb.install.linux
@@ -1,14 +1,23 @@
 #!/bin/bash -ex
 
+SDB_AC_NAME=.sdb-completion.bash
+SDB_SETTING_PATH=~/.sdb
+SDB_AC_SRC_PATH=${INSTALLED_PATH}/tools/${SDB_AC_NAME}
+SDB_AC_DST_PATH=${SDB_SETTING_PATH}/${SDB_AC_NAME}
+BASH_RC=~/.bashrc
 
-if [ -z "${TSUDO}" ]; then
-    gksudo -m "enable sdb autocomplete" "${INSTALLED_PATH}/tools/sdb-sudocmds ${INSTALLED_PATH}"
+rm -rf ${SDB_SETTING_PATH}
+mkdir -p ${SDB_SETTING_PATH}
+mv -f ${SDB_AC_SRC_PATH} ${SDB_AC_DST_PATH}
+
+if [ -f "${BASH_RC}" ]; then
+    if [ -z $(grep "source ~/\.sdb/\.sdb-completion\.bash" "${BASH_RC}") ]; then
+        echo -e "\n# Enable programmable sdb completion features.\nsource ~/.sdb/.sdb-completion.bash\n" >> "${BASH_RC}"
+    fi
 else
-    ${TSUDO} -m "enable sdb autocomplete" "${INSTALLED_PATH}/tools/sdb-sudocmds ${INSTALLED_PATH}"
+    echo -e "\n# Enable programmable sdb completion features.\nsource ~/.sdb/.sdb-completion.bash\n" >> "${BASH_RC}"
 fi
 
-rm -f ${INSTALLED_PATH}/tools/sdb-sudocmds
-
 # . /etc/bash_completion
 
 exit 0

diff --git a/package/sdb.remove.linux b/package/sdb.remove.linux
index 4cd75c8ea337f35866ffea51068cfbb027ac3bb8..fa1fc1c60f974b99dcde5d5c654ad58f060dc91c 100755 (executable)
--- a/package/sdb.remove.linux
+++ b/package/sdb.remove.linux
@@ -2,10 +2,9 @@
 SDB_PATH=tools/sdb
 ${INSTALLED_PATH}/${SDB_PATH} kill-server
 SDB_AC_NAME=sdb-autocomplete
-SDB_AC_DST_PATH=/etc/bash_completion.d/${SDB_AC_NAME}
 
 rm -rf ${INSTALLED_PATH}/${SDB_PATH}
-${TSUDO} "rm -rf ${SDB_AC_DST_PATH} /usr/bin/sdb"
+rm -rf ~/.sdb
 
 exit 0