Escape find for shell scripts

cherry-picked from owncloud-docker/base#50
owncloud-ci · Jun 12, 2018 · f1d81c8 · f1d81c8
1 parent ed1b6f4
commit f1d81c8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,3 +4,4 @@
 
 * Fixed
   * Allow quotes and spaces for occ command [#46](https://github.com/owncloud-docker/base/issues/46)
+  * Escape shell scripts within find [#45](https://github.com/owncloud-docker/base/issues/45)
diff --git a/rootfs/usr/local/bin/entrypoint b/rootfs/usr/local/bin/entrypoint
@@ -2,7 +2,7 @@
 set -eo pipefail
 [[ "${DEBUG}" == "true" ]] && set -x
 
-for FILE in $(find /etc/entrypoint.d -iname *.sh | sort)
+for FILE in $(find /etc/entrypoint.d -iname \*.sh | sort)
 do
   source ${FILE}
 done

diff --git a/rootfs/usr/local/bin/owncloud b/rootfs/usr/local/bin/owncloud
@@ -2,7 +2,7 @@
 set -eo pipefail
 [[ "${DEBUG}" == "true" ]] && set -x
 
-for FILE in $(find /etc/owncloud.d -iname *.sh | sort)
+for FILE in $(find /etc/owncloud.d -iname \*.sh | sort)
 do
   source ${FILE}
 done
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,4 @@

		* Fixed
		* Allow quotes and spaces for occ command [#46](https://github.com/owncloud-docker/base/issues/46)
		* Escape shell scripts within find [#45](https://github.com/owncloud-docker/base/issues/45)