From 0b0f678837f55f9acf902a249ec259c1f5e18607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gardais=20J=C3=A9r=C3=A9my?= Date: Wed, 17 Aug 2022 17:14:22 +0200 Subject: [PATCH] Manage return of disable function --- cluster/sge.disable.host.queue.sh | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/cluster/sge.disable.host.queue.sh b/cluster/sge.disable.host.queue.sh index 81975d1..301f21c 100755 --- a/cluster/sge.disable.host.queue.sh +++ b/cluster/sge.disable.host.queue.sh @@ -255,22 +255,21 @@ disable_sge_queue() { # {{{ local_sge_hostname="${1}" local_sge_queue_name="${2}" + return_disable_queue="1" + ## Simple debug message to valid current variables debug_message "disable_sge_queue − \ Try to disable SGE queue: ${RED}${local_sge_queue_name:=/dev/null}@${local_sge_hostname:=/dev/null}${COLOR_DEBUG}." ## SGE command to disable the queue - ## and get returned value - ## and create a file for local queue - qmod --disable "${local_sge_queue_name}@${local_sge_hostname}" > /dev/null \ - && return_disable_queue="${?}" \ - && { - [ "${LOCAL_HOST}" -eq "0" ] && printf '%s' "by ${PROGNAME} script" > "${sge_queue_deactivator}" - } - + ## fix returned value + ## create a file for local queue if run from the host + if qmod --disable "${local_sge_queue_name}@${local_sge_hostname}" > /dev/null; then + return_disable_queue="0" + [ "${LOCAL_HOST}" -eq "0" ] && printf '%s' "by ${PROGNAME} script" > "${sge_queue_deactivator}" + fi return "${return_disable_queue}" - } # }}} main() { # {{{