Improve _is_sourced check

from docker-library/postgres@d1cc089
docker-library · Oct 11, 2019 · 2501cf3 · 2501cf3
1 parent ddf116f
commit 2501cf3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/.template.Debian/docker-entrypoint.sh b/.template.Debian/docker-entrypoint.sh
@@ -42,7 +42,9 @@ file_env() {
 # check to see if this file is being run or sourced from another script
 _is_sourced() {
 	# https://unix.stackexchange.com/a/215279
-	[ "${FUNCNAME[${#FUNCNAME[@]} - 1]}" == 'source' ]
+	[ "${#FUNCNAME[@]}" -ge 2 ] \
+		&& [ "${FUNCNAME[0]}" = '_is_sourced' ] \
+		&& [ "${FUNCNAME[1]}" = 'source' ]
 }
 
 # usage: docker_process_init_files [file [file [...]]]

diff --git a/5.6/docker-entrypoint.sh b/5.6/docker-entrypoint.sh
@@ -42,7 +42,9 @@ file_env() {
 # check to see if this file is being run or sourced from another script
 _is_sourced() {
 	# https://unix.stackexchange.com/a/215279
-	[ "${FUNCNAME[${#FUNCNAME[@]} - 1]}" == 'source' ]
+	[ "${#FUNCNAME[@]}" -ge 2 ] \
+		&& [ "${FUNCNAME[0]}" = '_is_sourced' ] \
+		&& [ "${FUNCNAME[1]}" = 'source' ]
 }
 
 # usage: docker_process_init_files [file [file [...]]]

diff --git a/5.7/docker-entrypoint.sh b/5.7/docker-entrypoint.sh
@@ -42,7 +42,9 @@ file_env() {
 # check to see if this file is being run or sourced from another script
 _is_sourced() {
 	# https://unix.stackexchange.com/a/215279
-	[ "${FUNCNAME[${#FUNCNAME[@]} - 1]}" == 'source' ]
+	[ "${#FUNCNAME[@]}" -ge 2 ] \
+		&& [ "${FUNCNAME[0]}" = '_is_sourced' ] \
+		&& [ "${FUNCNAME[1]}" = 'source' ]
 }
 
 # usage: docker_process_init_files [file [file [...]]]

diff --git a/8.0/docker-entrypoint.sh b/8.0/docker-entrypoint.sh
@@ -42,7 +42,9 @@ file_env() {
 # check to see if this file is being run or sourced from another script
 _is_sourced() {
 	# https://unix.stackexchange.com/a/215279
-	[ "${FUNCNAME[${#FUNCNAME[@]} - 1]}" == 'source' ]
+	[ "${#FUNCNAME[@]}" -ge 2 ] \
+		&& [ "${FUNCNAME[0]}" = '_is_sourced' ] \
+		&& [ "${FUNCNAME[1]}" = 'source' ]
 }
 
 # usage: docker_process_init_files [file [file [...]]]