Ensure run.local files are located relative to the

...run file Prevent erroring if `run` is being executed within a sub-directory, like `assets`.
opdavies · Jul 31, 2024 · 4e255cd · 4e255cd
1 parent ac82467
commit 4e255cd
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 11 deletions.
diff --git a/templates/fractal/run.twig b/templates/fractal/run.twig
@@ -119,7 +119,8 @@ function _run {
 {% endif %}
 
 # Include any local tasks.
-[[ -e run.local ]] && source run.local
+# https://stackoverflow.com/a/6659698
+[[ -e "${BASH_SOURCE%/*}/run.local" ]] && source "${BASH_SOURCE%/*}/run.local"
 
 TIMEFORMAT=$'\nTask completed in %3lR'
 time "${@:-help}"

diff --git a/templates/php/drupal/run.twig b/templates/php/drupal/run.twig
@@ -159,7 +159,8 @@ function _run {
 }
 
 # Include any local tasks.
-[[ -e run.local ]] && source run.local
+# https://stackoverflow.com/a/6659698
+[[ -e "${BASH_SOURCE%/*}/run.local" ]] && source "${BASH_SOURCE%/*}/run.local"
 
 TIMEFORMAT=$'\nTask completed in %3lR'
 time "${@:-help}"

diff --git a/templates/php/sculpin/run.twig b/templates/php/sculpin/run.twig
@@ -35,7 +35,8 @@ function start {
 }
 
 # Include any local tasks.
-[[ -e run.local ]] && source run.local
+# https://stackoverflow.com/a/6659698
+[[ -e "${BASH_SOURCE%/*}/run.local" ]] && source "${BASH_SOURCE%/*}/run.local"
 
 TIMEFORMAT="Task completed in %3lR"
 time "${@:-help}"

diff --git a/templates/terraform/run.twig b/templates/terraform/run.twig
@@ -25,7 +25,8 @@ function help {
 }
 
 # Include any local tasks.
-[[ -e run.local ]] && source run.local
+# https://stackoverflow.com/a/6659698
+[[ -e "${BASH_SOURCE%/*}/run.local" ]] && source "${BASH_SOURCE%/*}/run.local"
 
 TIMEFORMAT=$'\nTask completed in %3lR'
 time "${@:-help}"

diff --git a/tests/snapshots/output/drupal-commerce-kickstart/run b/tests/snapshots/output/drupal-commerce-kickstart/run
@@ -103,12 +103,13 @@ function _run {
     --entrypoint "${command}" \
     --no-deps \
     --rm \
-    ${TTY} \
+    "${TTY}" \
     "${service}" "${@}"
 }
 
 # Include any local tasks.
-[[ -e run.local ]] && source run.local
+# https://stackoverflow.com/a/6659698
+[[ -e "${BASH_SOURCE%/*}/run.local" ]] && source "${BASH_SOURCE%/*}/run.local"
 
 TIMEFORMAT=$'\nTask completed in %3lR'
 time "${@:-help}"

diff --git a/tests/snapshots/output/drupal-localgov/run b/tests/snapshots/output/drupal-localgov/run
@@ -103,12 +103,13 @@ function _run {
     --entrypoint "${command}" \
     --no-deps \
     --rm \
-    ${TTY} \
+    "${TTY}" \
     "${service}" "${@}"
 }
 
 # Include any local tasks.
-[[ -e run.local ]] && source run.local
+# https://stackoverflow.com/a/6659698
+[[ -e "${BASH_SOURCE%/*}/run.local" ]] && source "${BASH_SOURCE%/*}/run.local"
 
 TIMEFORMAT=$'\nTask completed in %3lR'
 time "${@:-help}"

diff --git a/tests/snapshots/output/drupal/run b/tests/snapshots/output/drupal/run
@@ -121,12 +121,13 @@ function _run {
     --entrypoint "${command}" \
     --no-deps \
     --rm \
-    ${TTY} \
+    "${TTY}" \
     "${service}" "${@}"
 }
 
 # Include any local tasks.
-[[ -e run.local ]] && source run.local
+# https://stackoverflow.com/a/6659698
+[[ -e "${BASH_SOURCE%/*}/run.local" ]] && source "${BASH_SOURCE%/*}/run.local"
 
 TIMEFORMAT=$'\nTask completed in %3lR'
 time "${@:-help}"

diff --git a/tests/snapshots/output/fractal/run b/tests/snapshots/output/fractal/run
@@ -105,7 +105,8 @@ function _run {
 }
 
 # Include any local tasks.
-[[ -e run.local ]] && source run.local
+# https://stackoverflow.com/a/6659698
+[[ -e "${BASH_SOURCE%/*}/run.local" ]] && source "${BASH_SOURCE%/*}/run.local"
 
 TIMEFORMAT=$'\nTask completed in %3lR'
 time "${@:-help}"