Pass correct info to run funct. (#6126)

* Pass correct info to run funct. Changed to allow the correct parameters to be sent to the run function. Also changed to set apcupsd_status variable correctly. * Fixing as per comments
netdata · May 28, 2019 · 423057b · 423057b
1 parent e11a4e4
commit 423057b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/collectors/charts.d.plugin/apcupsd/apcupsd.chart.sh b/collectors/charts.d.plugin/apcupsd/apcupsd.chart.sh
@@ -47,8 +47,8 @@ apcupsd_check() {
 			error "cannot get information for apcupsd server ${host} on ${apcupsd_sources[${host}]}."
 			failed=$((failed + 1))
 		else
-			apcupsd_status=$(apcupsd_get ${apcupsd_sources[${host}]} | awk '/^STATUS.*/{ print $3 }')
-			if [ "$apcupsd_status" != "ONLINE" ]  && [ "$apcupsd_status" != "ONBATT" ]; then
+			apcupsd_status="$(apcupsd_get ${apcupsd_sources[${host}]} | awk '/^STATUS.*/{ print $3 }')"
+			if [ "${apcupsd_status}" != "ONLINE" ]  && [ "${apcupsd_status}" != "ONBATT" ]; then
 				error "APC UPS ${host} on ${apcupsd_sources[${host}]} is not online."
 				failed=$((failed + 1))
 			else

diff --git a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d.plugin/charts.d.plugin.in
@@ -304,7 +304,7 @@ run() {
 			printf " --- END TRACE ---\n"
 		} >&2
 	fi
-	rm "${TMP_DIR}/run.${pid}"
+	rm -f "${TMP_DIR}/run.${pid}"
 
 	return ${ret}
 }