Clean up syncProtoFromRepoBuild.sh

Author: chenchongli

bin/syncProtoFromRepoAndBuild.sh

@@ -3,48 +3,56 @@ BASE_DIR=`dirname "$0"`/..
 BASE_DIR=`cd "$BASE_DIR"; pwd`
 #echo "BASE_DIR=$BASE_DIR"
 
+PROTO_REPO_URL=https://github.com/Seagate/Kinetic-Protocol.git
 PROTO_DIR=$BASE_DIR/kinetic-common/src/main/java/com/seagate/kinetic/proto/
 PROTO_FILE=$BASE_DIR/kinetic-common/src/main/java/com/seagate/kinetic/proto/kinetic.proto
 CLONE_DIR=$BASE_DIR/bin/Kinetic-ProtocoL
 PROTO_COMPILE_DIR=$BASE_DIR/kinetic-common/src/main/java/
 
-if [ -f "$PROTO_FILE" ]; then
-    echo "$PROTO_FILE exists, does not sync and build, exit."
-    exit 0
-fi
+function syncFromProtoRepo(){
+    if [ -d "$CLONE_DIR" ]; then
+        rm -rf "$CLONE_DIR"
+    fi
 
-if [ -d "$CLONE_DIR" ]; then
-    rm -rf "$CLONE_DIR"
-fi
+    if [ $# -eq 0 ]; then
+        echo "Clone protocol file from github:"
+        git clone $PROTO_REPO_URL $CLONE_DIR
+    fi
 
-if [ $# -eq 0 ]; then
-    echo "Clone protocol file from github:"
-    git clone https://github.com/Seagate/Kinetic-Protocol.git $CLONE_DIR
-fi
+    if [ $# -eq 1 ]; then
+        echo "Clone protocol file $1 from github:"
+        git clone $PROTO_REPO_URL $CLONE_DIR
+        cd $CLONE_DIR
+        git checkout $1
+    fi
 
-if [ $# -eq 1 ]; then
-    echo "Clone protocol file $1 from github:"
-    git clone https://github.com/Seagate/Kinetic-Protocol.git $CLONE_DIR
-    cd $CLONE_DIR
-    git checkout $1
-    echo "$1"
-fi
+    cp $CLONE_DIR/kinetic.proto $PROTO_FILE
+
+    rm -rf "$CLONE_DIR"
 
-cp $CLONE_DIR/kinetic.proto $PROTO_FILE
+    echo "Sync protocol file finished."
+}
 
-rm -rf "$CLONE_DIR"
+function compileProto(){
+    echo "Compile protocol file: $PROTO_FILE."
+    protoc --proto_path=$PROTO_DIR --java_out=$PROTO_COMPILE_DIR $PROTO_FILE
 
-echo "Sync protocol file finished."
+    echo "Compile protocol file: $PROTO_DIR/kineticDb.proto."
+    protoc --proto_path=$PROTO_DIR --java_out=$PROTO_COMPILE_DIR $PROTO_DIR/kineticDb.proto
 
-echo "Compile protocol file: $PROTO_FILE."
-protoc --proto_path=$PROTO_DIR --java_out=$PROTO_COMPILE_DIR $PROTO_FILE
+    echo "Compile protocol file: $PROTO_DIR/kineticIo.proto."
+    protoc --proto_path=$PROTO_DIR --java_out=$PROTO_COMPILE_DIR $PROTO_DIR/kineticIo.proto
 
-echo "Compile protocol file: $PROTO_DIR/kineticDb.proto."
-protoc --proto_path=$PROTO_DIR --java_out=$PROTO_COMPILE_DIR $PROTO_DIR/kineticDb.proto
+    echo "Compile finished."
+}
 
-echo "Compile protocol file: $PROTO_DIR/kineticIo.proto."
-protoc --proto_path=$PROTO_DIR --java_out=$PROTO_COMPILE_DIR $PROTO_DIR/kineticIo.proto
+if [ -f "$PROTO_FILE" ]; then
+    echo "$PROTO_FILE exists, does not sync from repo."
+else
+    echo "$PROTO_FILE does not exists, sync from repo"
+    syncFromProtoRepo
+fi
 
-echo "Compile finished."
+compileProto
 
-exit 0
+exit 0