From 252fe23bd349e59bf23ab1a16aecf633d22a9c05 Mon Sep 17 00:00:00 2001
From: BianTanggui <zhouhongyu6@huawei.com>
Date: Wed, 14 Oct 2020 11:57:20 +0800
Subject: [PATCH] Match-id-3fdc425ce739d29f9a9ac37dcdbad364e616755e

---
 build/build.sh             |  3 ++-
 build/scripts/run_main.sh  | 27 ++++++++++++++-------------
 build/scripts/uninstall.sh | 17 +++++++++++++++++
 3 files changed, 33 insertions(+), 14 deletions(-)
 create mode 100644 build/scripts/uninstall.sh

diff --git a/build/build.sh b/build/build.sh
index 93d13ff..169e926 100644
--- a/build/build.sh
+++ b/build/build.sh
@@ -74,9 +74,10 @@ function build_run_package()
     mkdir run_pkg
 
     /bin/cp -f {${RUNTIMESRCDIR},${HOOKSRCDIR},${INSTALLHELPERSRCDIR},${CLISRCDIR}}/build/ascend-docker*  run_pkg
+    /bin/cp -f scripts/uninstall.sh run_pkg
     FILECNT=`ls -l run_pkg |grep "^-"|wc -l`
     echo "prepare package $FILECNT bins"
-    if [ $FILECNT -ne 4 ]; then
+    if [ $FILECNT -ne 5 ]; then
         exit 1
     fi
 
diff --git a/build/scripts/run_main.sh b/build/scripts/run_main.sh
index 2c830c2..abe9692 100644
--- a/build/scripts/run_main.sh
+++ b/build/scripts/run_main.sh
@@ -14,9 +14,16 @@ function install()
     cp -f ./ascend-docker-runtime ${INSTALL_PATH}/ascend-docker-runtime
     cp -f ./ascend-docker-hook ${INSTALL_PATH}/ascend-docker-hook
     cp -f ./ascend-docker-cli ${INSTALL_PATH}/ascend-docker-cli
+    cp -f ./ascend-docker-plugin-install-helper ${INSTALL_PATH}/ascend-docker-plugin-install-helper
     chmod 550 ${INSTALL_PATH}/ascend-docker-runtime
     chmod 550 ${INSTALL_PATH}/ascend-docker-hook
     chmod 550 ${INSTALL_PATH}/ascend-docker-cli
+    chmod 550 ${INSTALL_PATH}/ascend-docker-plugin-install-helper
+
+    mkdir -p ${INSTALL_PATH}/script
+    cp -f ./uninstall.sh ${INSTALL_PATH}/script/uninstall.sh
+    chmod 550 ${INSTALL_PATH}/script/uninstall.sh
+
     echo 'install executable files success'
 
     if [ ! -d "${DOCKER_CONFIG_DIR}" ]; then
@@ -45,22 +52,12 @@ function uninstall()
         exit 0
     fi
 
+    ${INSTALL_PATH}/script/uninstall.sh
+    echo 'remove daemon.json setting success'
+
     rm -rf ${INSTALL_PATH}
     echo 'remove executable files success'
 
-    SRC="${DOCKER_CONFIG_DIR}/daemon.json.${PPID}"
-    DST="${DOCKER_CONFIG_DIR}/daemon.json"
-    if [ ! -f "${DST}" ]; then
-        exit 0
-    fi
-
-    ./ascend-docker-plugin-install-helper rm ${DST} ${SRC}
-    if [ "$?" != "0" ]; then
-        echo 'ERROR: del damon.json failed'
-        exit 1
-    fi
-
-    mv ${SRC} ${DST} 
     echo 'del damom.json success'
 }
 
@@ -76,9 +73,13 @@ function upgrade()
     cp -f ./ascend-docker-runtime ${INSTALL_PATH}/ascend-docker-runtime
     cp -f ./ascend-docker-hook ${INSTALL_PATH}/ascend-docker-hook
     cp -f ./ascend-docker-cli ${INSTALL_PATH}/ascend-docker-cli
+    cp -f ./ascend-docker-plugin-install-helper ${INSTALL_PATH}/ascend-docker-plugin-install-helper
+    cp -f ./uninstall.sh ${INSTALL_PATH}/script/uninstall.sh
     chmod 550 ${INSTALL_PATH}/ascend-docker-runtime
     chmod 550 ${INSTALL_PATH}/ascend-docker-hook
     chmod 550 ${INSTALL_PATH}/ascend-docker-cli
+    chmod 550 ${INSTALL_PATH}/ascend-docker-plugin-install-helper
+    chmod 550 ${INSTALL_PATH}/script/uninstall.sh
 
     echo 'upgrade ascend docker runtime success'
 }
diff --git a/build/scripts/uninstall.sh b/build/scripts/uninstall.sh
new file mode 100644
index 0000000..93ba8a2
--- /dev/null
+++ b/build/scripts/uninstall.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+ROOT=$(cd `dirname $0`; pwd)/..
+DST='/etc/docker/daemon.json'
+SRC="${DST}.${PPID}"
+
+if [ ! -f "${DST}" ]; then
+    exit 0
+fi
+
+${ROOT}/ascend-docker-plugin-install-helper rm ${DST} ${SRC}
+if [ "$?" != "0" ]; then
+    echo 'ERROR: del damon.json failed'
+    exit 1
+fi
+
+mv ${SRC} ${DST}