From 60406d55f9c4a48431b7241d236ba624e64beb6c Mon Sep 17 00:00:00 2001 From: Packit Date: Sep 09 2020 16:27:17 +0000 Subject: Apply patch RHCLOUD-6204-fix-shellcheck-warnings-aa5d586.patch patch_name: RHCLOUD-6204-fix-shellcheck-warnings-aa5d586.patch present_in_specfile: true location_in_specfile: 1 --- diff --git a/data/cron/insights-client.cron b/data/cron/insights-client.cron index aa5cff6..82add66 100644 --- a/data/cron/insights-client.cron +++ b/data/cron/insights-client.cron @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # This file is part of insights-client. # @@ -13,13 +13,13 @@ RANDOM_DELAY_SEC=14400 ENABLE_CHECK_RESULTS="yes" if [ -f /etc/sysconfig/insights-client ]; then + # shellcheck source=insights-client . /etc/sysconfig/insights-client fi -DELAY=$((1 + RANDOM % ${RANDOM_DELAY_SEC})) +DELAY=$((1 + RANDOM % RANDOM_DELAY_SEC)) /bin/sleep ${DELAY} -/sbin/service cgconfig status > /dev/null 2>&1 -if [ $? == 0 ]; +if [ "$(/sbin/service cgconfig status)" == "Running" ]; then /bin/cgcreate -g memory,cpu,blkio:insights /bin/cgset -r memory.limit_in_bytes=2147483648 insights @@ -29,13 +29,13 @@ then /bin/cgset -r blkio.weight=100 insights /bin/cgexec -g memory,cpu,blkio:insights /usr/bin/timeout 10m ${path} --retry 3 --quiet /bin/cgdelete memory,cpu,blkio:insights - if [ -n ${ENABLE_CHECK_RESULTS} ]; then + if [[ -n ${ENABLE_CHECK_RESULTS} ]]; then /bin/sleep 120 ${path} --check-results fi else /usr/bin/timeout 10m ${path} --quiet - if [ -n ${ENABLE_CHECK_RESULTS} ]; then + if [[ -n ${ENABLE_CHECK_RESULTS} ]]; then /bin/sleep 120 /usr/bin/timeout 10m ${path} --check-results fi diff --git a/src/redhat-access-insights.in b/src/redhat-access-insights.in index dfa016b..62f7bfe 100644 --- a/src/redhat-access-insights.in +++ b/src/redhat-access-insights.in @@ -1,5 +1,5 @@ #!/bin/sh -echo "WARNING: $(basename $0) is deprecated and will be removed in a future release; use 'insights-client' instead." +echo "WARNING: $(basename "$0") is deprecated and will be removed in a future release; use 'insights-client' instead." sleep 3 -exec @bindir@/insights-client $@ +exec @bindir@/insights-client "$@"