From 71615fd13f92f2e9b2fa1421b0426b1f8a10d981 Mon Sep 17 00:00:00 2001 From: pra-moh <49077256+pra-moh@users.noreply.github.com> Date: Sat, 23 Nov 2019 12:30:56 -0800 Subject: [PATCH] [telemetry.sh] Fix string null check with special characters by adding quotes (#3810) * adding quotes for string comparison with special characters * Update dockers/docker-sonic-telemetry/telemetry.sh Co-Authored-By: Joe LeVeque * Update dockers/docker-sonic-telemetry/telemetry.sh Co-Authored-By: Joe LeVeque --- dockers/docker-sonic-telemetry/telemetry.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dockers/docker-sonic-telemetry/telemetry.sh b/dockers/docker-sonic-telemetry/telemetry.sh index 053b1dae6ead..8cfd8a531cca 100755 --- a/dockers/docker-sonic-telemetry/telemetry.sh +++ b/dockers/docker-sonic-telemetry/telemetry.sh @@ -7,7 +7,7 @@ TELEMETRY=`sonic-cfggen -d -v 'TELEMETRY.keys() | join(" ") if TELEMETRY'` TELEMETRY_ARGS=" -logtostderr" -if [ ! -z $X509 ]; then +if [ -n "$X509" ]; then SERVER_CRT=`sonic-cfggen -d -v "DEVICE_METADATA['x509']['server_crt']"` SERVER_KEY=`sonic-cfggen -d -v "DEVICE_METADATA['x509']['server_key']"` if [ -z $SERVER_CRT ] || [ -z $SERVER_KEY ]; then @@ -19,7 +19,7 @@ else TELEMETRY_ARGS+=" --insecure" fi -if [ ! -z $X509 ]; then +if [ -n "$X509" ]; then CA_CRT=`sonic-cfggen -d -v "DEVICE_METADATA['x509']['ca_crt']"` if [ ! -z $CA_CRT ]; then TELEMETRY_ARGS+=" --ca_crt $CA_CRT" @@ -47,5 +47,3 @@ else fi exec /usr/sbin/telemetry ${TELEMETRY_ARGS} - -