From 02f7de3c76c090516e38f84bbb8f65566e299ba5 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Tue, 29 Jan 2019 13:39:41 +0800 Subject: [PATCH 1/4] [go-xcat] Makw `go-xcat away' do the uninstallation without prompting --- xCAT-server/share/xcat/tools/go-xcat | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat index d2f8e00a2..a2e9b63bd 100755 --- a/xCAT-server/share/xcat/tools/go-xcat +++ b/xCAT-server/share/xcat/tools/go-xcat @@ -1976,13 +1976,9 @@ do exit_if_bad "$?" "Try \`$0 --help' for more information" GO_XCAT_ACTION="$1" case "$1 $2" in - "completely uninstall") + "completely uninstall"|"smoke test") shift - GO_XCAT_ACTION="away" - ;; - "smoke test") - shift - GO_XCAT_ACTION="smoke test" + GO_XCAT_ACTION="$1 $2" ;; esac ;; @@ -1991,7 +1987,13 @@ do done case "${GO_XCAT_ACTION}" in -"away"|"check"|"install"|"uninstall"|"update") +"away") + GO_XCAT_YES=("-y") + ;; +"completely uninstall") + GO_XCAT_ACTION="away" + ;; +"check"|"install"|"uninstall"|"update") ;; "smoke test") smoke_testing From 40c4c6a22dd34502feef03bb7390785ef235491c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Fri, 22 Mar 2019 12:57:16 +0800 Subject: [PATCH 2/4] Better debug log when reading repository failed --- xCAT-server/share/xcat/tools/go-xcat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat index a2e9b63bd..330971547 100755 --- a/xCAT-server/share/xcat/tools/go-xcat +++ b/xCAT-server/share/xcat/tools/go-xcat @@ -2122,7 +2122,7 @@ if [[ "${RET}" -ne 0 ]] then echo "failed" echo "${ERR_MSG}" >&2 - exit "${RET}" + boo_boo_if_bad "${RET}" fi echo "done" From 0a829159c0c56243d05fe8cf3b7c2fb3e0b4428d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Fri, 22 Mar 2019 12:53:30 +0800 Subject: [PATCH 3/4] Change log for go-xcat --- xCAT-server/share/xcat/tools/go-xcat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat index 330971547..c30261a26 100755 --- a/xCAT-server/share/xcat/tools/go-xcat +++ b/xCAT-server/share/xcat/tools/go-xcat @@ -21,6 +21,8 @@ # 2018-09-28 GONG Jie # - Revised debug log # - xCAT uninstallation +# 2019-03-22 GONG Jie +# - Better debug log when reading repository failed # function usage() From 3376f23278f467bf885a0d715bed63e1d82c3820 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Fri, 22 Mar 2019 12:53:58 +0800 Subject: [PATCH 4/4] Bump version number for go-xcat --- xCAT-server/share/xcat/tools/go-xcat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat index c30261a26..139d945fd 100755 --- a/xCAT-server/share/xcat/tools/go-xcat +++ b/xCAT-server/share/xcat/tools/go-xcat @@ -2,7 +2,7 @@ # # go-xcat - Install xCAT automatically. # -# Version 1.0.34 +# Version 1.0.36 # # Copyright (C) 2016, 2017, 2018 International Business Machines # Eclipse Public License, Version 1.0 (EPL-1.0)