diff --git a/atfile.sh b/atfile.sh index d1d9a79..d8643ef 100755 --- a/atfile.sh +++ b/atfile.sh @@ -54,16 +54,22 @@ function atfile.devel.die() { exit 255 } +unset ATFILE_DEVEL +unset ATFILE_DEVEL_DIR +unset ATFILE_DEVEL_ENTRY +unset ATFILE_DEVEL_SOURCE + if [[ "${BASH_SOURCE[0]}" != "$0" ]]; then - atfile.devel.die "Unable to source" + ATFILE_DEVEL=1 + ATFILE_DEVEL_DIR="$(dirname "${BASH_SOURCE[0]}")" + ATFILE_DEVEL_ENTRY="$(realpath "${BASH_SOURCE[0]}")" + ATFILE_DEVEL_SOURCE="$ATFILE_DEVEL_ENTRY" +else + ATFILE_DEVEL=1 + ATFILE_DEVEL_DIR="$(dirname "$(realpath "$0")")" + ATFILE_DEVEL_ENTRY="$(realpath "$0")" fi -# shellcheck disable=SC2034 -ATFILE_DEVEL=1 -ATFILE_DEVEL_DIR="$(dirname "$(realpath "$0")")" -# shellcheck disable=SC2034 -ATFILE_DEVEL_ENTRY="$(realpath "$0")" - if [ ! -x "$(command -v git)" ]; then atfile.devel.die "'git' not installed (download: https://git-scm.com/downloads)" fi @@ -79,14 +85,14 @@ git describe --exact-match --tags > /dev/null 2>&1 [[ -z $ATFILE_FORCE_META_YEAR ]] && ATFILE_FORCE_META_YEAR="$year" [[ -z $ATFILE_FORCE_VERSION ]] && ATFILE_FORCE_VERSION="$version" -declare -a ATFILE_DEVEL_SOURCES +declare -a ATFILE_DEVEL_INCLUDES -for f in "$ATFILE_DEVEL_DIR/src/commands/"*; do ATFILE_DEVEL_SOURCES+=("$f"); done -for f in "$ATFILE_DEVEL_DIR/src/lexi/"*; do ATFILE_DEVEL_SOURCES+=("$f"); done -for f in "$ATFILE_DEVEL_DIR/src/shared/"*; do ATFILE_DEVEL_SOURCES+=("$f"); done -ATFILE_DEVEL_SOURCES+=("$ATFILE_DEVEL_DIR/src/entry.sh") +for f in "$ATFILE_DEVEL_DIR/src/commands/"*; do ATFILE_DEVEL_INCLUDES+=("$f"); done +for f in "$ATFILE_DEVEL_DIR/src/lexi/"*; do ATFILE_DEVEL_INCLUDES+=("$f"); done +for f in "$ATFILE_DEVEL_DIR/src/shared/"*; do ATFILE_DEVEL_INCLUDES+=("$f"); done +ATFILE_DEVEL_INCLUDES+=("$ATFILE_DEVEL_DIR/src/entry.sh") -for path in "${ATFILE_DEVEL_SOURCES[@]}" +for path in "${ATFILE_DEVEL_INCLUDES[@]}" do if [[ ! -f "$path" ]]; then atfile.devel.die "Unable to find source for '$path'" diff --git a/src/commands/now.sh b/src/commands/now.sh index 1827b08..6e44b86 100644 --- a/src/commands/now.sh +++ b/src/commands/now.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -function atfile.invoke.now() { +function atfile.now() { date="$1" atfile.util.get_date "$date" } diff --git a/src/commands/release.sh b/src/commands/release.sh index 4933c0d..094416a 100644 --- a/src/commands/release.sh +++ b/src/commands/release.sh @@ -52,7 +52,7 @@ function atfile.release() { # Psst! You can \`source atfile\` in your own Bash scripts! " >> "$dist_path" - for s in "${ATFILE_DEVEL_SOURCES[@]}" + for s in "${ATFILE_DEVEL_INCLUDES[@]}" do if [[ "$s" != *"/src/commands/release.sh" ]]; then if [[ -f "$s" ]]; then diff --git a/src/commands/something_broke.sh b/src/commands/something_broke.sh index b7f375c..e79cfc2 100644 --- a/src/commands/something_broke.sh +++ b/src/commands/something_broke.sh @@ -69,9 +69,10 @@ $(atfile.something_broke.print_envvar "DEBUG" "$_debug_default") $(atfile.something_broke.print_envvar "DEVEL") $(atfile.something_broke.print_envvar "DEVEL_DIR") $(atfile.something_broke.print_envvar "DEVEL_ENTRY") +↳ ${_envvar_prefix}_DEVEL_INCLUDES: +$(for s in "${ATFILE_DEVEL_INCLUDES[@]}"; do echo " ↳ $s"; done) +$(atfile.something_broke.print_envvar "DEVEL_SOURCE") $(atfile.something_broke.print_envvar "DEVEL_PUBLISH" "$_devel_publish_default") -↳ ${_envvar_prefix}_DEVEL_SOURCES: -$(for s in "${ATFILE_DEVEL_SOURCES[@]}"; do echo " ↳ $s"; done) $(atfile.something_broke.print_envvar "DISABLE_UPDATE_CHECKING" "$_disable_update_checking_default") $(atfile.something_broke.print_envvar "DISABLE_UPDATER" "$_disable_updater_default") ↳ ${_envvar_prefix}_DIST_PASSWORD: $([[ -n $(atfile.util.get_envvar "${_envvar_prefix}_DIST_PASSWORD") ]] && echo "(Set)")