pkgship/0002-fix-install-and-start-script-info.patch
liheavy f9aaef568a update info of script
(cherry picked from commit 3c82e20299020ff30b690944985674238987c1bf)
2021-09-03 10:35:12 +08:00

28 lines
1.2 KiB
Diff

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
}