From: khemendra.kumar <khemendra.kumar13@gmail.com>
Date: Mon, 22 Jul 2019 10:43:19 +0000 (+0530)
Subject: ELIOT code optimization
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=9202f3fb1bfda869974e46e5c177dbd4c5d04417;p=eliot.git

ELIOT code optimization

-- remove extra debug log
-- macro for kubedge compile path

Signed-off-by: khemendra.kumar <khemendra.kumar13@gmail.com>
Change-Id: I059e7306727eaec7dd6399d72dd440a0f230fe18
---

diff --git a/scripts/src/kubeedge_setup.sh b/scripts/src/kubeedge_setup.sh
index 56c6db5..4d6b606 100755
--- a/scripts/src/kubeedge_setup.sh
+++ b/scripts/src/kubeedge_setup.sh
@@ -8,6 +8,10 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
+#Constants
+KUBEEDGE_SRC="$GOPATH/src/github.com/kubeedge/kubeedge"
+KUBEEDGE_BIN="$GOPATH/src/github.com/kubeedge/kubeedge/keadm"
+
 { set +x; } > /dev/null 2>&1
 
 if [ -n "$1" ]; then
@@ -35,24 +39,22 @@ take_keedge(){
 
     source ~/.profile
     git clone https://github.com/kubeedge/kubeedge.git \
-$GOPATH/src/github.com/kubeedge/kubeedge
-    cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm
+    $KUBEEDGE_SRC
+    cd $KUBEEDGE_BIN
     make
 }
 
 source config_kubeedge > /dev/null 2>&1
 
 common_steps="echo $GOPATH && \
-echo $HOME && \
-echo $(whoami) && \
-git clone https://github.com/kubeedge/kubeedge.git $GOPATH/src/github.com/kubeedge/kubeedge && \
+git clone https://github.com/kubeedge/kubeedge.git $KUBEEDGE_SRC && \
 source ~/.profile && \
 cd $GOPATH/src && \
 sudo chmod -R 777 github.com && \
-cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm && \
+cd $KUBEEDGE_BIN && \
 make"
 
-edge_start="cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm && \
+edge_start="cd $KUBEEDGE_BIN && \
 sudo chmod +x keadm && \
 sudo ./keadm join --edgecontrollerip=$MASTERNODEIP --edgenodeid=$EDGENODEID \
 --k8sserverip=$MASTERNODEIP:8080"
@@ -60,7 +62,7 @@ sudo ./keadm join --edgecontrollerip=$MASTERNODEIP --edgenodeid=$EDGENODEID \
 # Initialisation of ELIOT master with kubeedge
 
 execute_keedge_controller(){
-    cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm
+    cd $KUBEEDGE_BIN
     sudo chmod +x keadm
     sudo ./keadm init
 }