From 7d664960dfb5a9323d6c6cdf9c9e42af8cc47569 Mon Sep 17 00:00:00 2001
From: Slava Semushin <vsemushi@redhat.com>
Date: Tue, 6 Jun 2017 20:03:26 +0200
Subject: [PATCH] examples/volumes/flexvolume/nfs: check for jq and simplify
 quoting.

---
 examples/volumes/flexvolume/nfs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/examples/volumes/flexvolume/nfs b/examples/volumes/flexvolume/nfs
index 31254506327..4d0977cec87 100755
--- a/examples/volumes/flexvolume/nfs
+++ b/examples/volumes/flexvolume/nfs
@@ -48,7 +48,7 @@ domount() {
 	SHARE=$(echo $2 | jq -r '.share')
 
 	if [ $(ismounted) -eq 1 ] ; then
-		log "{\"status\": \"Success\"}"
+		log '{"status": "Success"}'
 		exit 0
 	fi
 
@@ -59,14 +59,14 @@ domount() {
 		err "{ \"status\": \"Failure\", \"message\": \"Failed to mount ${NFS_SERVER}:${SHARE} at ${MNTPATH}\"}"
 		exit 1
 	fi
-	log "{\"status\": \"Success\"}"
+	log '{"status": "Success"}'
 	exit 0
 }
 
 unmount() {
 	MNTPATH=$1
 	if [ $(ismounted) -eq 0 ] ; then
-		log "{\"status\": \"Success\"}"
+		log '{"status": "Success"}'
 		exit 0
 	fi
 
@@ -76,14 +76,19 @@ unmount() {
 		exit 1
 	fi
 
-	log "{\"status\": \"Success\"}"
+	log '{"status": "Success"}'
 	exit 0
 }
 
 op=$1
 
+if ! command -v jq >/dev/null 2>&1; then
+	err "{ \"status\": \"Failure\", \"message\": \"'jq' binary not found. Please install jq package before using this driver\"}"
+	exit 1
+fi
+
 if [ "$op" = "init" ]; then
-	log "{\"status\": \"Success\", \"capabilities\": {\"attach\": false}}"
+	log '{"status": "Success", "capabilities": {"attach": false}}'
 	exit 0
 fi
 
@@ -101,7 +106,7 @@ case "$op" in
 		unmount $*
 		;;
 	*)
-		log "{ \"status\": \"Not supported\" }"
+		log '{"status": "Not supported"}'
 		exit 0
 esac