From b4984d7c606086d5a6d716f99fad94aea9b0055c Mon Sep 17 00:00:00 2001 From: Julien Grobbelaar Date: Mon, 10 Jun 2019 10:40:13 +0100 Subject: [PATCH] Send warning about chowning folder to stdout. --- src/3.3/docker-entrypoint.sh | 4 ++-- src/3.4/docker-entrypoint.sh | 4 ++-- src/3.5/docker-entrypoint.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/3.3/docker-entrypoint.sh b/src/3.3/docker-entrypoint.sh index 16939830..54f35ea7 100755 --- a/src/3.3/docker-entrypoint.sh +++ b/src/3.3/docker-entrypoint.sh @@ -74,11 +74,11 @@ function check_mounted_folder_with_chown if running_as_root; then if is_not_writable "${mountFolder}"; then # warn that we're about to chown the folder and then chown it - echo >&2 "Warning: Folder mounted to \"${mountFolder}\" is not writable from inside container. Changing folder owner to ${userid}." + echo "Warning: Folder mounted to \"${mountFolder}\" is not writable from inside container. Changing folder owner to ${userid}." chown -R "${userid}":"${groupid}" "${mountFolder}" fi else - if [ ! -w "${mountFolder}" ] && [[ "$(stat -c %U ${mountFolder})" != "neo4j" ]]; then + if [[ ! -w "${mountFolder}" ]] && [[ "$(stat -c %U ${mountFolder})" != "neo4j" ]]; then print_permissions_advice_and_fail "${mountFolder}" fi fi diff --git a/src/3.4/docker-entrypoint.sh b/src/3.4/docker-entrypoint.sh index f6d60a9e..b08317d0 100755 --- a/src/3.4/docker-entrypoint.sh +++ b/src/3.4/docker-entrypoint.sh @@ -74,11 +74,11 @@ function check_mounted_folder_with_chown if running_as_root; then if is_not_writable "${mountFolder}"; then # warn that we're about to chown the folder and then chown it - echo >&2 "Warning: Folder mounted to \"${mountFolder}\" is not writable from inside container. Changing folder owner to ${userid}." + echo "Warning: Folder mounted to \"${mountFolder}\" is not writable from inside container. Changing folder owner to ${userid}." chown -R "${userid}":"${groupid}" "${mountFolder}" fi else - if [ ! -w "${mountFolder}" ] && [[ "$(stat -c %U ${mountFolder})" != "neo4j" ]]; then + if [[ ! -w "${mountFolder}" ]] && [[ "$(stat -c %U ${mountFolder})" != "neo4j" ]]; then print_permissions_advice_and_fail "${mountFolder}" fi fi diff --git a/src/3.5/docker-entrypoint.sh b/src/3.5/docker-entrypoint.sh index f6d60a9e..b08317d0 100755 --- a/src/3.5/docker-entrypoint.sh +++ b/src/3.5/docker-entrypoint.sh @@ -74,11 +74,11 @@ function check_mounted_folder_with_chown if running_as_root; then if is_not_writable "${mountFolder}"; then # warn that we're about to chown the folder and then chown it - echo >&2 "Warning: Folder mounted to \"${mountFolder}\" is not writable from inside container. Changing folder owner to ${userid}." + echo "Warning: Folder mounted to \"${mountFolder}\" is not writable from inside container. Changing folder owner to ${userid}." chown -R "${userid}":"${groupid}" "${mountFolder}" fi else - if [ ! -w "${mountFolder}" ] && [[ "$(stat -c %U ${mountFolder})" != "neo4j" ]]; then + if [[ ! -w "${mountFolder}" ]] && [[ "$(stat -c %U ${mountFolder})" != "neo4j" ]]; then print_permissions_advice_and_fail "${mountFolder}" fi fi