From ac3b30ca4f692fc9935766d210d5de501f17e403 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Wed, 12 Aug 2020 17:00:53 +0100
Subject: [PATCH] Fix docker command override.

---
 docker/1.5-openssl/docker-entrypoint.sh |  6 ++++++
 docker/1.5/docker-entrypoint.sh         | 15 +++++----------
 docker/1.6-openssl/docker-entrypoint.sh | 15 +++++----------
 docker/1.6/docker-entrypoint.sh         | 15 +++++----------
 4 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/docker/1.5-openssl/docker-entrypoint.sh b/docker/1.5-openssl/docker-entrypoint.sh
index b381ac57..378d91ec 100755
--- a/docker/1.5-openssl/docker-entrypoint.sh
+++ b/docker/1.5-openssl/docker-entrypoint.sh
@@ -1,4 +1,10 @@
 #!/bin/ash
 set -e
 
+# Set permissions
+user="$(id -u)"
+if [ "$user" = '0' ]; then
+	[ -d "/mosquitto" ] && chown -R mosquitto:mosquitto /mosquitto
+fi
+
 exec "$@"
diff --git a/docker/1.5/docker-entrypoint.sh b/docker/1.5/docker-entrypoint.sh
index 85099f54..378d91ec 100755
--- a/docker/1.5/docker-entrypoint.sh
+++ b/docker/1.5/docker-entrypoint.sh
@@ -1,15 +1,10 @@
 #!/bin/ash
 set -e
 
-docker_set_permissions() {
-	local user; user="$(id -u)"
-
-	if [ "$user" = '0' ]; then
-		chown -R mosquitto:mosquitto /mosquitto
-	fi
-}
-
-
-docker_set_permissions()
+# Set permissions
+user="$(id -u)"
+if [ "$user" = '0' ]; then
+	[ -d "/mosquitto" ] && chown -R mosquitto:mosquitto /mosquitto
+fi
 
 exec "$@"
diff --git a/docker/1.6-openssl/docker-entrypoint.sh b/docker/1.6-openssl/docker-entrypoint.sh
index 85099f54..378d91ec 100755
--- a/docker/1.6-openssl/docker-entrypoint.sh
+++ b/docker/1.6-openssl/docker-entrypoint.sh
@@ -1,15 +1,10 @@
 #!/bin/ash
 set -e
 
-docker_set_permissions() {
-	local user; user="$(id -u)"
-
-	if [ "$user" = '0' ]; then
-		chown -R mosquitto:mosquitto /mosquitto
-	fi
-}
-
-
-docker_set_permissions()
+# Set permissions
+user="$(id -u)"
+if [ "$user" = '0' ]; then
+	[ -d "/mosquitto" ] && chown -R mosquitto:mosquitto /mosquitto
+fi
 
 exec "$@"
diff --git a/docker/1.6/docker-entrypoint.sh b/docker/1.6/docker-entrypoint.sh
index 85099f54..378d91ec 100755
--- a/docker/1.6/docker-entrypoint.sh
+++ b/docker/1.6/docker-entrypoint.sh
@@ -1,15 +1,10 @@
 #!/bin/ash
 set -e
 
-docker_set_permissions() {
-	local user; user="$(id -u)"
-
-	if [ "$user" = '0' ]; then
-		chown -R mosquitto:mosquitto /mosquitto
-	fi
-}
-
-
-docker_set_permissions()
+# Set permissions
+user="$(id -u)"
+if [ "$user" = '0' ]; then
+	[ -d "/mosquitto" ] && chown -R mosquitto:mosquitto /mosquitto
+fi
 
 exec "$@"