more renaming for clarity

This commit is contained in:
Christian Winther 2024-01-05 00:11:20 +00:00
parent d13895a3e0
commit 99e2a045a6
8 changed files with 12 additions and 12 deletions

View file

@ -8,7 +8,7 @@
#
# We also don't need to source `helpers.sh` since it's already available
entrypoint-set-name "${BASH_SOURCE[0]}"
entrypoint-set-script-name "${BASH_SOURCE[0]}"
load-config-files

View file

@ -1,7 +1,7 @@
#!/bin/bash
source /docker/helpers.sh
entrypoint-set-name "$0"
entrypoint-set-script-name "$0"
# Show [git diff] of templates being rendered (will help verify output)
: ${ENTRYPOINT_SHOW_TEMPLATE_DIFF:=1}

View file

@ -1,7 +1,7 @@
#!/bin/bash
source /docker/helpers.sh
entrypoint-set-name "$0"
entrypoint-set-script-name "$0"
# Copy the [storage/] skeleton files over the "real" [storage/] directory so assets are updated between versions
run-as-runtime-user cp --recursive storage.skel/ storage/

View file

@ -1,7 +1,7 @@
#!/bin/bash
source /docker/helpers.sh
entrypoint-set-name "$0"
entrypoint-set-script-name "$0"
# Optionally fix ownership of configured paths
: ${ENTRYPOINT_ENSURE_OWNERSHIP_PATHS:=""}

View file

@ -1,6 +1,6 @@
#!/bin/bash
source /docker/helpers.sh
entrypoint-set-name "$0"
entrypoint-set-script-name "$0"
run-as-runtime-user php artisan horizon:publish

View file

@ -1,7 +1,7 @@
#!/bin/bash
source /docker/helpers.sh
entrypoint-set-name "$0"
entrypoint-set-script-name "$0"
run-as-runtime-user php artisan route:cache
run-as-runtime-user php artisan view:cache

View file

@ -15,7 +15,7 @@ export ENTRYPOINT_ROOT
source /docker/helpers.sh
# Set the entrypoint name for logging
entrypoint-set-name "entrypoint.sh"
entrypoint-set-script-name "entrypoint.sh"
# Convert ENTRYPOINT_SKIP_SCRIPTS into a native bash array for easier lookup
declare -a skip_scripts
@ -58,7 +58,7 @@ find "${ENTRYPOINT_ROOT}" -follow -type f -print | sort -V | while read -r file;
# the sourced file will (should) than the log prefix, so this restores our own
# "global" log prefix once the file is done being sourced
entrypoint-restore-name
entrypoint-restore-script-name
;;
*.sh)

View file

@ -21,15 +21,15 @@ declare -ra dot_env_files=(
# environment keys seen when source dot files (so we can [export] them)
declare -ga seen_dot_env_variables=()
# @description Restore the log prefix to the previous value that was captured in [entrypoint-set-name]
# @description Restore the log prefix to the previous value that was captured in [entrypoint-set-script-name ]
# @arg $1 string The name (or path) of the entrypoint script being run
function entrypoint-set-name() {
function entrypoint-set-script-name() {
log_prefix_previous="${log_prefix}"
log_prefix="ENTRYPOINT - [$(get-entrypoint-script-name $1)] - "
}
# @description Restore the log prefix to the previous value that was captured in [entrypoint-set-name]
function entrypoint-restore-name() {
# @description Restore the log prefix to the previous value that was captured in [entrypoint-set-script-name ]
function entrypoint-restore-script-name() {
log_prefix="${log_prefix_previous}"
}