From 206bf0a3968e372bbdda60e217faba8d6a93f5f0 Mon Sep 17 00:00:00 2001
From: BianTanggui <songxiangbing@huawei.com>
Date: Thu, 16 Feb 2023 19:45:49 +0800
Subject: [PATCH] Match-id-c911fbb442ba6616d9e4d439886b7f64268e3b40

---
 README.md                  | 6 ++++--
 build/build.sh             | 9 ++++-----
 build/scripts/run_main.sh  | 8 ++++----
 build/scripts/uninstall.sh | 2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 4fa9122..6a8604f 100644
--- a/README.md
+++ b/README.md
@@ -38,15 +38,17 @@ git clone -b sync-dev https://gitee.com/ascend/ascend-docker-runtime.git
 
  2、下载tag为v1.1.10的安全函数库
 ````shell
-cd /home/test/ascend-docker-runtime
+cd /home/test/ascend-docker-runtime/platform
 git clone -b v1.1.10 https://gitee.com/openeuler/libboundscheck.git
 ````
 
 3、下载makeself
 ```shell
 cd ../opensource
-git clone https://gitee.com/src-openeuler/makeself.git
+git clone -b openEuler-22.03-LTS https://gitee.com/src-openeuler/makeself.git
 tar -zxvf makeself/makeself-2.4.2.tar.gz
+git clone https://gitee.com/song-xiangbing/makeself-header.git
+cp makeself-header/makeself-header.sh makeself-release-2.4.2/
 ```
  4、编译
 ```shell
diff --git a/build/build.sh b/build/build.sh
index 6f4bbb3..7ee6891 100644
--- a/build/build.sh
+++ b/build/build.sh
@@ -18,7 +18,6 @@
 set -ex
 
 ROOT=$(cd $(dirname $0); pwd)/..
-TOP_DIR=$ROOT/..
 
 OPENSRC=${ROOT}/opensource
 PLATFORM=${ROOT}/platform
@@ -51,12 +50,12 @@ RUNTIMESRCDIR=${RUNTIMESRCPATH%/${RUNTIMESRCNAME}}
 
 PACKAGENAME="Ascend-docker-runtime"
 
-VERSION="v3.0.0"
-version_file="${TOP_DIR}"/service_config.ini
+VERSION="5.0.RC1"
+version_file="${ROOT}"/service_config.ini
 if  [ -f "$version_file" ]; then
-  line=$(sed -n '4p' "$version_file" 2>&1)
+  line=$(sed -n '1p' "$version_file" 2>&1)
   #cut the chars after ':'
-  VERSION=${line#*:}
+  VERSION=${line#*=}
 fi
 
 CPUARCH=$(uname -m)
diff --git a/build/scripts/run_main.sh b/build/scripts/run_main.sh
index 95673c5..87d60a0 100644
--- a/build/scripts/run_main.sh
+++ b/build/scripts/run_main.sh
@@ -27,7 +27,7 @@ function save_install_args() {
         rm "${INSTALL_PATH}"/ascend_docker_runtime_install.info
     fi
     {
-      echo -e "version=${PACKAGE_VERSION}"
+      echo -e "version=v${PACKAGE_VERSION}"
       echo -e "arch=$(uname -m)"
       echo -e "os=linux"
       echo -e "path=${INSTALL_PATH}"
@@ -109,13 +109,13 @@ function install()
     echo 'create damom.json success'
     save_install_args
     echo "[INFO]: Ascend Docker Runtime has been installed in: ${INSTALL_PATH}"
-    echo "[INFO]: The version of Ascend Docker Runtime is: ${PACKAGE_VERSION}"
+    echo "[INFO]: The version of Ascend Docker Runtime is: v${PACKAGE_VERSION}"
     echo 'please reboot docker daemon to take effect'
 }
 
 function uninstall()
 {
-    echo "[INFO]: Uninstalling ascend docker runtime ${PACKAGE_VERSION}"
+    echo "[INFO]: Uninstalling ascend docker runtime v${PACKAGE_VERSION}"
 
     if [ ! -d "${INSTALL_PATH}" ]; then
         echo 'WARNING: the specified install path does not exist, skipping'
@@ -179,7 +179,7 @@ function upgrade()
 
     echo "[INFO]: Ascend Docker Runtime has been installed in: ${INSTALL_PATH}"
     echo '[INFO]: upgrade ascend docker runtime success'
-    echo "[INFO]: The version of Ascend Docker Runtime is: ${PACKAGE_VERSION}"
+    echo "[INFO]: The version of Ascend Docker Runtime is: v${PACKAGE_VERSION}"
 }
 
 INSTALL_FLAG=n
diff --git a/build/scripts/uninstall.sh b/build/scripts/uninstall.sh
index 4c320d5..6ba1d46 100644
--- a/build/scripts/uninstall.sh
+++ b/build/scripts/uninstall.sh
@@ -16,7 +16,7 @@
 # ============================================================================
 
 set -e
-LOG_FILE="/var/log/ascend_seclog/ascend_toolbox_install.log"
+LOG_FILE="/var/log/ascend-docker-runtime/installer.log"
 echo "Ascend-Docker-Runtime" $(date +%Y%m%d-%H:%M:%S) "start uninstall"
 echo "Ascend-Docker-Runtime" $(date +%Y%m%d-%H:%M:%S) "start uninstall"  >>${LOG_FILE}
 ROOT=$(cd $(dirname $0); pwd)/..