Merge pull request #294 from hgdharold/master

tianon · web-flow · commit b9cf4ef8f093 · 2018-08-20T12:21:53.000-07:00
error get dbPath from json
diff --git a/3.2/docker-entrypoint.sh b/3.2/docker-entrypoint.sh
@@ -168,7 +168,7 @@ _dbPath() {
 
 	if ! dbPath="$(_mongod_hack_get_arg_val --dbpath "$@")"; then
 		if _parse_config "$@"; then
-			dbPath="$(jq '.storage.dbPath' "$jsonConfigFile")"
+			dbPath="$(jq -r '.storage.dbPath' "$jsonConfigFile")"
 		fi
 	fi
 
diff --git a/3.4/docker-entrypoint.sh b/3.4/docker-entrypoint.sh
@@ -168,7 +168,7 @@ _dbPath() {
 
 	if ! dbPath="$(_mongod_hack_get_arg_val --dbpath "$@")"; then
 		if _parse_config "$@"; then
-			dbPath="$(jq '.storage.dbPath' "$jsonConfigFile")"
+			dbPath="$(jq -r '.storage.dbPath' "$jsonConfigFile")"
 		fi
 	fi
 
diff --git a/3.6/docker-entrypoint.sh b/3.6/docker-entrypoint.sh
@@ -168,7 +168,7 @@ _dbPath() {
 
 	if ! dbPath="$(_mongod_hack_get_arg_val --dbpath "$@")"; then
 		if _parse_config "$@"; then
-			dbPath="$(jq '.storage.dbPath' "$jsonConfigFile")"
+			dbPath="$(jq -r '.storage.dbPath' "$jsonConfigFile")"
 		fi
 	fi
 
diff --git a/4.0/docker-entrypoint.sh b/4.0/docker-entrypoint.sh
@@ -168,7 +168,7 @@ _dbPath() {
 
 	if ! dbPath="$(_mongod_hack_get_arg_val --dbpath "$@")"; then
 		if _parse_config "$@"; then
-			dbPath="$(jq '.storage.dbPath' "$jsonConfigFile")"
+			dbPath="$(jq -r '.storage.dbPath' "$jsonConfigFile")"
 		fi
 	fi
 
diff --git a/4.1/docker-entrypoint.sh b/4.1/docker-entrypoint.sh
@@ -168,7 +168,7 @@ _dbPath() {
 
 	if ! dbPath="$(_mongod_hack_get_arg_val --dbpath "$@")"; then
 		if _parse_config "$@"; then
-			dbPath="$(jq '.storage.dbPath' "$jsonConfigFile")"
+			dbPath="$(jq -r '.storage.dbPath' "$jsonConfigFile")"
 		fi
 	fi
 
