diff --git a/client/plugins/docker/tor.bash b/client/plugins/docker/tor.bash index fa65a6a..6a28948 100755 --- a/client/plugins/docker/tor.bash +++ b/client/plugins/docker/tor.bash @@ -129,6 +129,8 @@ function tor::restart() function main() { + [ -z "$global_basename" ] && lib_utils::die_fatal + local -r _usage=" \e[32mDescription:\e[0m @@ -137,10 +139,10 @@ function main() \e[32mUsage:\e[0m \e[37;2m# Client (host) command\e[0m - $ dfi $instance plugins repo${global_arg_delim_1}$(basename $0) <{start|up}|restart|{stop|down}> + $ $global_basename $instance plugins repo${global_arg_delim_1}$(basename $0) <{start|up}|restart|{stop|down}> \e[37;2m# Container command (see \`fetch\` help for usage)\e[0m - $ dfi fetch help + $ $global_basename fetch help " case "$1" in diff --git a/client/src/docker/docker.bash b/client/src/docker/docker.bash index dc54769..2e94b16 100755 --- a/client/src/docker/docker.bash +++ b/client/src/docker/docker.bash @@ -97,55 +97,55 @@ function main() \e[37;2m#\e[0m \e[37;2m# Generate default environment and build default image\e[0m - $ dfi archlinux${global_arg_delim_1}${USER}:default gen \\ - && dfi archlinux${global_arg_delim_1}${USER}:default build type${global_arg_delim_2}default + $ $global_basename archlinux${global_arg_delim_1}${USER}:default gen \\ + && $global_basename archlinux${global_arg_delim_1}${USER}:default build type${global_arg_delim_2}default \e[37;2m# Bring up container, open shell (type 'exit' to leave)\e[0m - $ dfi archlinux${global_arg_delim_1}${USER}:default up + $ $global_basename archlinux${global_arg_delim_1}${USER}:default up \e[37;2m# In another shell (or after you exit), open a container root shell\e[0m - $ dfi archlinux${global_arg_delim_1}${USER}:default shell user${global_arg_delim_2}root + $ $global_basename archlinux${global_arg_delim_1}${USER}:default shell user${global_arg_delim_2}root \e[37;2m# In another shell (or after you exit), edit client/container variables\e[0m - $ dfi archlinux${global_arg_delim_1}${USER}:default edit type${global_arg_delim_2}env + $ $global_basename archlinux${global_arg_delim_1}${USER}:default edit type${global_arg_delim_2}env \e[37;2m# Spawn a container with given command (removed after command finishes)\e[0m \e[37;2m# NOTE: incredibly useful when used with your host's crontab\e[0m - $ dfi archlinux${global_arg_delim_1}${USER}:default run 'dfi family/alice fetch all${global_arg_delim_2}price' + $ $global_basename archlinux${global_arg_delim_1}${USER}:default run 'dfi family/alice fetch all${global_arg_delim_2}price' \e[37;2m# Bring down running container (stop and remove container & network)\e[0m - $ dfi archlinux${global_arg_delim_1}${USER}:default down + $ $global_basename archlinux${global_arg_delim_1}${USER}:default down \e[37;2m# Backup image, delete old image, build new image\e[0m - $ dfi archlinux${global_arg_delim_1}${USER}:default backup \\ - && dfi archlinux${global_arg_delim_1}${USER}:default rm \\ - && dfi archlinux${global_arg_delim_1}${USER}:default build + $ $global_basename archlinux${global_arg_delim_1}${USER}:default backup \\ + && $global_basename archlinux${global_arg_delim_1}${USER}:default rm \\ + && $global_basename archlinux${global_arg_delim_1}${USER}:default build \e[37;2m# Print current version of 'docker-finance' and client/container ('finance') dependencies\e[0m - $ dfi archlinux${global_arg_delim_1}${USER}:default version type${global_arg_delim_2}all + $ $global_basename archlinux${global_arg_delim_1}${USER}:default version type${global_arg_delim_2}all \e[37;2m# Print Tor plugin's usage help\e[0m - $ dfi archlinux${global_arg_delim_1}${USER}:default plugins repo${global_arg_delim_1}tor.bash help + $ $global_basename archlinux${global_arg_delim_1}${USER}:default plugins repo${global_arg_delim_1}tor.bash help \e[37;2m#\e[0m \e[37;2m# Dev-tools platform\e[0m \e[37;2m#\e[0m \e[37;2m# Generate default environment and build default image\e[0m - $ dfi dev-tools${global_arg_delim_1}${USER}:default gen \\ - && dfi dev-tools${global_arg_delim_1}${USER}:default build type${global_arg_delim_2}default + $ $global_basename dev-tools${global_arg_delim_1}${USER}:default gen \\ + && $global_basename dev-tools${global_arg_delim_1}${USER}:default build type${global_arg_delim_2}default \e[37;2m# Spawn a container with given command (removed after command finishes)\e[0m - $ dfi dev-tools${global_arg_delim_1}${USER}:default run 'shellcheck --version' + $ $global_basename dev-tools${global_arg_delim_1}${USER}:default run 'shellcheck --version' \e[37;2m# Lint entire docker-finance source\e[0m - $ dfi dev-tools${global_arg_delim_1}${USER}:default linter type${global_arg_delim_2}bash${global_arg_delim_3}php${global_arg_delim_3}c++ + $ $global_basename dev-tools${global_arg_delim_1}${USER}:default linter type${global_arg_delim_2}bash${global_arg_delim_3}php${global_arg_delim_3}c++ \e[37;2m# Generate Doxygen for docker-finance source\e[0m - $ dfi dev-tools${global_arg_delim_1}${USER}:default doxygen gen + $ $global_basename dev-tools${global_arg_delim_1}${USER}:default doxygen gen \e[37;2m# Print current version of 'docker-finance' and client/container ('dev-tools') dependencies\e[0m - $ dfi dev-tools${global_arg_delim_1}${USER}:default version type${global_arg_delim_2}all + $ $global_basename dev-tools${global_arg_delim_1}${USER}:default version type${global_arg_delim_2}all \e[32mTips:\e[0m diff --git a/client/src/docker/lib/lib_docker.bash b/client/src/docker/lib/lib_docker.bash index 5b7a05f..1f1fb0f 100644 --- a/client/src/docker/lib/lib_docker.bash +++ b/client/src/docker/lib/lib_docker.bash @@ -48,7 +48,7 @@ source "${DOCKER_FINANCE_CLIENT_REPO}/container/src/finance/lib/internal/lib_uti # # Top-level caller -global_basename="$(basename -- $0)" +global_basename="dfi" declare -rx global_basename # Globals argument delimiters diff --git a/container/src/finance/lib/lib_finance.bash b/container/src/finance/lib/lib_finance.bash index d995633..95793b8 100644 --- a/container/src/finance/lib/lib_finance.bash +++ b/container/src/finance/lib/lib_finance.bash @@ -36,7 +36,7 @@ fi umask go-rwx # Top-level caller -global_basename="$(basename $0)" +global_basename="dfi" declare -rx global_basename # Dependencies