From f9aaef568aa7df1522c92fb1fa66c2bda20d6a07 Mon Sep 17 00:00:00 2001
From: liheavy <17865196565@163.com>
Date: Thu, 2 Sep 2021 19:22:36 +0800
Subject: [PATCH] update info of script

(cherry picked from commit 3c82e20299020ff30b690944985674238987c1bf)
---
 0002-fix-install-and-start-script-info.patch | 27 ++++++++++++++++++++
 pkgship.spec                                 | 10 ++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 0002-fix-install-and-start-script-info.patch

diff --git a/0002-fix-install-and-start-script-info.patch b/0002-fix-install-and-start-script-info.patch
new file mode 100644
index 0000000..7d50f38
--- /dev/null
+++ b/0002-fix-install-and-start-script-info.patch
@@ -0,0 +1,27 @@
+diff --git a/packageship/pkgshipd b/packageship/pkgshipd
+index 9cb3dc694e39f188a1e8775b37087c16059317b9..e1e843019d459ecde4aeaa6c18feb1e9d2d4fda1 100644
+--- a/packageship/pkgshipd
++++ b/packageship/pkgshipd
+@@ -357,7 +357,7 @@ try:
+     response = redis.Redis(host='$redis_ip',
+                            port="$redis_port")
+     print(response.ping())
+-except redis.ConnectionError:
++except Exception:
+     print(False)"
+   python3_version=$(python3 --version)
+   if [[ "${python3_version}" =~ "command not found" ]]; then
+
+diff --git a/packageship/auto_install_pkgship_requires.sh b/packageship/auto_install_pkgship_requires.sh
+index 4a914034170cd11e3996c34814806e8448862a32..5ecce235dae835050960046fa28a148b7326f1c4 100644
+--- a/packageship/auto_install_pkgship_requires.sh
++++ b/packageship/auto_install_pkgship_requires.sh
+@@ -128,7 +128,7 @@ function main() {
+   elif [ "${INSTALL_SOFTWARE}" = "redis" ]; then
+     download_install_redis
+   else
+-    echo "Failed to parse parameters, please use 'bash auto_install_es.sh elasticsearch/redis' "
++    echo "Failed to parse parameters, please use '/bin/bash auto_install_pkgship_requires.sh elasticsearch/redis' "
+     exit 1
+   fi
+ }
diff --git a/pkgship.spec b/pkgship.spec
index 6b893f1..a5f2b81 100755
--- a/pkgship.spec
+++ b/pkgship.spec
@@ -1,11 +1,12 @@
 Name:           pkgship
 Version:        2.2.0
-Release:        2
+Release:        3
 Summary:        Pkgship implements rpm package dependence ,maintainer, patch query and so on.
 License:        Mulan 2.0
 URL:            https://gitee.com/openeuler/pkgship
 Source0:        https://gitee.com/openeuler/pkgship-%{version}.tar.gz
-patch0001:      0001-bugfix-pkginfo.patch
+Patch0001:      0001-bugfix-pkginfo.patch
+Patch0002:      0002-fix-install-and-start-script-info.patch
 
 BuildArch:      noarch
 
@@ -111,6 +112,11 @@ create_dir_file /var/log/pkgship-operation 700 d
 %attr(0640,pkgshipuser,pkgshipuser) /lib/systemd/system/pkgship.service
 
 %changelog
+* Thu Sep 2 2021 Haiwei Li <lihaiwei8@huawei.com> - 2.2.0-3
+- When the input parameters of the script that executes the installation of es and redis are incorrect, 
+- the prompt message is incorrect.
+- When the redis port setting is unreasonable, the prompt message for starting the service is incorrect.
+
 * Wed Aug 25 2021 Pengju Jiang <jiangpengju2@huawei.com> - 2.2.0-2
 - when the command line is parsing a single package of json data, there will be none in the
 - required_by_bin and required_by_bin lists in the json data, resulting in parsing errors,