From 9cd0fceaf9514ef8e2cd6629435436b0dc7c2855 Mon Sep 17 00:00:00 2001 From: Robert Stoll Date: Tue, 15 Apr 2025 21:46:10 +0200 Subject: [PATCH 1/2] bc: rename setup.sh to setup_tegonal_scripts.sh this way a consumer does not run into shellcheck recursion issues if a file is named setup.sh as well --- .github/ISSUE_TEMPLATE/bug_report.yaml | 2 +- .gt/remotes/tegonal-gh-commons/pull-hook.sh | 2 +- README.md | 86 +++++++++--------- scripts/before-pr.sh | 2 +- scripts/check-in-bug-template.sh | 2 +- scripts/cleanup-on-push-to-main.sh | 2 +- scripts/prepare-next-dev-cycle.sh | 2 +- scripts/release.sh | 2 +- scripts/run-shellcheck.sh | 2 +- scripts/run-shfmt.sh | 2 +- src/ci/jelastic/deploy.doc.sh | 2 +- src/ci/jelastic/deploy.sh | 4 +- src/ci/jelastic/utils.doc.sh | 2 +- src/ci/jelastic/utils.sh | 4 +- src/qa/run-shellcheck-pull-hooks.doc.sh | 2 +- src/qa/run-shellcheck-pull-hooks.sh | 4 +- src/qa/run-shellcheck.doc.sh | 2 +- src/qa/run-shellcheck.sh | 4 +- src/qa/run-shellspec-if-installed.doc.sh | 2 +- src/qa/run-shellspec-if-installed.sh | 4 +- src/qa/run-shfmt.doc.sh | 2 +- src/qa/run-shfmt.sh | 4 +- src/releasing/pre-release-checks-git.doc.sh | 2 +- src/releasing/pre-release-checks-git.sh | 4 +- .../prepare-files-next-dev-cycle.doc.sh | 2 +- src/releasing/prepare-files-next-dev-cycle.sh | 4 +- .../prepare-next-dev-cycle-template.doc.sh | 2 +- .../prepare-next-dev-cycle-template.sh | 4 +- src/releasing/release-files.doc.sh | 2 +- src/releasing/release-files.sh | 4 +- src/releasing/release-template.doc.sh | 2 +- src/releasing/release-template.sh | 4 +- src/releasing/sbt-publish-to-sonatype.doc.sh | 2 +- src/releasing/sbt-publish-to-sonatype.sh | 4 +- src/releasing/sneak-peek-banner.doc.sh | 2 +- src/releasing/sneak-peek-banner.sh | 4 +- src/releasing/toggle-sections.doc.sh | 2 +- src/releasing/toggle-sections.sh | 4 +- src/releasing/update-version-README.doc.sh | 2 +- src/releasing/update-version-README.sh | 4 +- .../update-version-common-steps.doc.sh | 2 +- src/releasing/update-version-common-steps.sh | 4 +- .../update-version-issue-templates.doc.sh | 2 +- .../update-version-issue-templates.sh | 4 +- src/releasing/update-version-scripts.doc.sh | 2 +- src/releasing/update-version-scripts.sh | 4 +- src/setup.sh.sig | Bin 566 -> 0 bytes ...up.doc.sh => setup_tegonal_scripts.doc.sh} | 2 +- src/{setup.sh => setup_tegonal_scripts.sh} | 6 +- src/utility/array-utils.doc.sh | 2 +- src/utility/array-utils.sh | 4 +- src/utility/ask.doc.sh | 2 +- src/utility/ask.sh | 4 +- src/utility/checks.doc.sh | 2 +- src/utility/checks.sh | 4 +- src/utility/cleanups.doc.sh | 2 +- src/utility/cleanups.sh | 4 +- src/utility/date-utils.doc.sh | 2 +- src/utility/date-utils.sh | 4 +- src/utility/execute-if-defined.doc.sh | 2 +- src/utility/execute-if-defined.sh | 4 +- src/utility/git-utils.doc.sh | 2 +- src/utility/git-utils.sh | 4 +- src/utility/gpg-utils.doc.sh | 2 +- src/utility/gpg-utils.sh | 4 +- src/utility/http.doc.sh | 2 +- src/utility/http.sh | 4 +- src/utility/io.doc.sh | 2 +- src/utility/io.sh | 4 +- src/utility/log.doc.sh | 2 +- src/utility/log.sh | 4 +- src/utility/parse-args.doc.sh | 2 +- src/utility/parse-args.sh | 4 +- src/utility/parse-commands.doc.sh | 2 +- src/utility/parse-commands.sh | 4 +- src/utility/parse-fn-args.doc.sh | 2 +- src/utility/parse-fn-args.sh | 4 +- src/utility/parse-utils.doc.sh | 2 +- src/utility/parse-utils.sh | 4 +- src/utility/recursive-declare-p.doc.sh | 2 +- src/utility/recursive-declare-p.sh | 4 +- src/utility/replace-help-snippet.doc.sh | 2 +- src/utility/replace-help-snippet.sh | 4 +- src/utility/replace-snippet.doc.sh | 2 +- src/utility/replace-snippet.sh | 4 +- src/utility/secret-utils.doc.sh | 2 +- src/utility/secret-utils.sh | 4 +- src/utility/source-once.doc.sh | 2 +- src/utility/source-once.sh | 2 +- src/utility/string-utils.doc.sh | 2 +- src/utility/string-utils.sh | 4 +- src/utility/update-bash-docu.doc.sh | 2 +- src/utility/update-bash-docu.sh | 4 +- 93 files changed, 175 insertions(+), 175 deletions(-) delete mode 100644 src/setup.sh.sig rename src/{setup.doc.sh => setup_tegonal_scripts.doc.sh} (86%) rename src/{setup.sh => setup_tegonal_scripts.sh} (90%) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index dc7f322d..0b5dbbff 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -65,7 +65,7 @@ body: - utility/secret-utils.sh - utility/source-once.sh - utility/update-bash-docu.sh - - setup.sh + - setup_tegonal_scripts.sh validations: required: false - type: textarea diff --git a/.gt/remotes/tegonal-gh-commons/pull-hook.sh b/.gt/remotes/tegonal-gh-commons/pull-hook.sh index e50d69df..4404ec43 100755 --- a/.gt/remotes/tegonal-gh-commons/pull-hook.sh +++ b/.gt/remotes/tegonal-gh-commons/pull-hook.sh @@ -20,7 +20,7 @@ fi if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../../src" - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_github_commons/gt/pull-hook-functions.sh" diff --git a/README.md b/README.md index 8b85d620..de4f3f1c 100644 --- a/README.md +++ b/README.md @@ -58,14 +58,14 @@ export TEGONAL_SCRIPTS_VERSION="v4.10.0" gt pull -r tegonal-scripts -t "$TEGONAL_SCRIPTS_VERSION" -p ... ``` -Note that dependencies have to be pulled manually and almost all scripts depend on `src/setup.sh` +Note that dependencies have to be pulled manually and almost all scripts depend on `src/setup_tegonal_scripts.sh` which in turn depends on `src/utility/source-once.sh` and this one depends on `src/utility/log.sh`. Many of the scripts depend on further scripts located in `src/utility`. -Therefore, for simplicity reasons, we recommend you pull `src/setup.sh` and all files in `src/utility` in addition: +Therefore, for simplicity reasons, we recommend you pull `src/setup_tegonal_scripts.sh` and all files in `src/utility` in addition: ``` export TEGONAL_SCRIPTS_VERSION="v4.10.0" -gt pull -r tegonal-scripts -t "$TEGONAL_SCRIPTS_VERSION" -p src/setup.sh +gt pull -r tegonal-scripts -t "$TEGONAL_SCRIPTS_VERSION" -p src/setup_tegonal_scripts.sh gt pull -r tegonal-scripts -t "$TEGONAL_SCRIPTS_VERSION" -p src/utility/ ``` @@ -76,7 +76,7 @@ We recommend you use the following code at the beginning of your script in case - + ```bash #!/usr/bin/env bash set -euo pipefail @@ -86,7 +86,7 @@ if ! [[ -v dir_of_tegonal_scripts ]]; then # Assumes your script is in (root is project folder) e.g. /src or /scripts and # the tegonal scripts have been pulled via gt and put into /lib/tegonal-scripts dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/io.sh" @@ -94,7 +94,7 @@ sourceOnce "$dir_of_tegonal_scripts/utility/io.sh" -Note that `source "$dir_of_tegonal_scripts/setup.sh"` will automatically source `utility/source-once.sh` +Note that `source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh"` will automatically source `utility/source-once.sh` and `utility/log.sh` # Documentation @@ -235,7 +235,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # typically you would define those via secrets (GitHub) or Variables (Gitlab) JELASTIC_LOGIN='my-user' @@ -304,7 +304,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/ci/jelastic/jelastic-utils.sh" @@ -343,7 +343,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" source "$dir_of_tegonal_scripts/qa/run-shellcheck.sh" @@ -382,7 +382,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" source "$dir_of_tegonal_scripts/qa/run-shellspec-if-installed.sh" @@ -408,7 +408,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" source "$dir_of_tegonal_scripts/qa/run-shfmt.sh" @@ -486,7 +486,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" scriptsDir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)" sourceOnce "$scriptsDir/before-pr.sh" @@ -572,7 +572,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" scriptsDir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)" sourceOnce "$scriptsDir/before-pr.sh" @@ -671,7 +671,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" function releaseScalaLib() { sbt publishSigned @@ -756,7 +756,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" function prepareNextAfterVersionUpdateHook() { # some additional version bumps e.g. using perl @@ -829,7 +829,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # checks releasing v0.1.0 makes sense and the current branch is main "$dir_of_tegonal_scripts/releasing/pre-release-checks-git.sh" -v v0.1.0 @@ -869,7 +869,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # ask for SONATYPE_USER and SONATYPE_PW (unless already exported beforehand) and calls sbt publishSigned "$dir_of_tegonal_scripts/releasing/sbt-publish-to-sonatype.sh" @@ -932,7 +932,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # updates the version in headers of different files, hides the sneak-peek banner and # toggles sections in README.md for release @@ -1020,7 +1020,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" "$dir_of_tegonal_scripts/releasing/update-version-README.sh" -v 0.1.0 @@ -1079,7 +1079,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" "$dir_of_tegonal_scripts/releasing/update-version-scripts.sh" -v 0.1.0 @@ -1138,7 +1138,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" "$dir_of_tegonal_scripts/releasing/update-issue-templates.sh" -v 0.1.0 @@ -1211,7 +1211,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" "$dir_of_tegonal_scripts/releasing/toggle-sections.sh" -c main @@ -1266,7 +1266,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" "$dir_of_tegonal_scripts/releasing/sneak-peek-banner.sh" -c hide @@ -1296,7 +1296,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/array-utils.sh" @@ -1344,7 +1344,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/ask.sh" @@ -1380,7 +1380,7 @@ projectDir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2> # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$projectDir/lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/cleanups.sh" @@ -1406,7 +1406,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/checks.sh" @@ -1489,7 +1489,7 @@ projectDir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2> # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$projectDir/lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/date-utils.sh" @@ -1533,7 +1533,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/git-utils.sh" @@ -1594,7 +1594,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/gpg-utils.sh" @@ -1666,7 +1666,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/http.sh" @@ -1687,7 +1687,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/io.sh" @@ -1723,7 +1723,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/log.sh" @@ -1810,7 +1810,7 @@ MY_LIB_VERSION="v1.1.0" # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/parse-args.sh" @@ -1862,7 +1862,7 @@ shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors abov if ! [[ -v dir_of_tegonal_scripts ]]; then # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/parse-fn-args.sh" @@ -1908,7 +1908,7 @@ MY_LIB_VERSION="v1.1.0" # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/parse-commands.sh" @@ -1957,7 +1957,7 @@ MY_LIBRARY_VERSION="v1.0.3" if ! [[ -v dir_of_tegonal_scripts ]]; then # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/parse-utils.sh" @@ -1995,7 +1995,7 @@ shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors abov # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" source "$dir_of_tegonal_scripts/utility/recursive-declare-p.sh" @@ -2035,7 +2035,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" source "$dir_of_tegonal_scripts/utility/replace-snippet.sh" @@ -2079,7 +2079,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" source "$dir_of_tegonal_scripts/utility/secret-utils.sh" @@ -2118,7 +2118,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" source "$dir_of_tegonal_scripts/utility/source-once.sh" @@ -2158,7 +2158,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" source "$dir_of_tegonal_scripts/utility/string-utils.sh" @@ -2189,7 +2189,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" source "$dir_of_tegonal_scripts/utility/update-bash-docu.sh" diff --git a/scripts/before-pr.sh b/scripts/before-pr.sh index b811a1cb..90011bcf 100755 --- a/scripts/before-pr.sh +++ b/scripts/before-pr.sh @@ -19,7 +19,7 @@ fi if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$scriptsDir/../src" - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/checks.sh" sourceOnce "$dir_of_tegonal_scripts/qa/run-shellspec-if-installed.sh" diff --git a/scripts/check-in-bug-template.sh b/scripts/check-in-bug-template.sh index 27d7ad81..0cf363ce 100755 --- a/scripts/check-in-bug-template.sh +++ b/scripts/check-in-bug-template.sh @@ -19,7 +19,7 @@ fi if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$scriptsDir/../src" - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi function checkInBugTemplate() { diff --git a/scripts/cleanup-on-push-to-main.sh b/scripts/cleanup-on-push-to-main.sh index 834b32f0..b2817c8f 100755 --- a/scripts/cleanup-on-push-to-main.sh +++ b/scripts/cleanup-on-push-to-main.sh @@ -24,7 +24,7 @@ fi if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$scriptsDir/../src" - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/cleanups.sh" diff --git a/scripts/prepare-next-dev-cycle.sh b/scripts/prepare-next-dev-cycle.sh index f0a02856..a84f2c61 100755 --- a/scripts/prepare-next-dev-cycle.sh +++ b/scripts/prepare-next-dev-cycle.sh @@ -25,7 +25,7 @@ fi if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$projectDir/src" - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/releasing/prepare-files-next-dev-cycle.sh" sourceOnce "$scriptsDir/before-pr.sh" diff --git a/scripts/release.sh b/scripts/release.sh index 61d01d50..b610e8ef 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -30,7 +30,7 @@ fi if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$projectDir/src" - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/releasing/release-files.sh" sourceOnce "$dir_of_tegonal_scripts/utility/checks.sh" diff --git a/scripts/run-shellcheck.sh b/scripts/run-shellcheck.sh index 452cd9e8..c96db24b 100755 --- a/scripts/run-shellcheck.sh +++ b/scripts/run-shellcheck.sh @@ -19,7 +19,7 @@ fi if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$scriptsDir/../src" - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/qa/run-shellcheck.sh" diff --git a/scripts/run-shfmt.sh b/scripts/run-shfmt.sh index 0bfc4df4..ea457ad9 100755 --- a/scripts/run-shfmt.sh +++ b/scripts/run-shfmt.sh @@ -19,7 +19,7 @@ fi if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$scriptsDir/../src" - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/qa/run-shfmt.sh" diff --git a/src/ci/jelastic/deploy.doc.sh b/src/ci/jelastic/deploy.doc.sh index da871b8a..d14d53e0 100644 --- a/src/ci/jelastic/deploy.doc.sh +++ b/src/ci/jelastic/deploy.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # typically you would define those via secrets (GitHub) or Variables (Gitlab) JELASTIC_LOGIN='my-user' diff --git a/src/ci/jelastic/deploy.sh b/src/ci/jelastic/deploy.sh index 355b4aa1..9ffba832 100755 --- a/src/ci/jelastic/deploy.sh +++ b/src/ci/jelastic/deploy.sh @@ -18,7 +18,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # # typically you would define those via secrets (GitHub) or Variables (Gitlab) # JELASTIC_LOGIN='my-user' @@ -43,7 +43,7 @@ export TEGONAL_SCRIPTS_VERSION='v4.11.0-SNAPSHOT' if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/parse-args.sh" sourceOnce "$dir_of_tegonal_scripts/ci/jelastic/utils.sh" diff --git a/src/ci/jelastic/utils.doc.sh b/src/ci/jelastic/utils.doc.sh index 8dd56d3a..7c149487 100644 --- a/src/ci/jelastic/utils.doc.sh +++ b/src/ci/jelastic/utils.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/ci/jelastic/jelastic-utils.sh" diff --git a/src/ci/jelastic/utils.sh b/src/ci/jelastic/utils.sh index 7442b2f1..a0f753bc 100755 --- a/src/ci/jelastic/utils.sh +++ b/src/ci/jelastic/utils.sh @@ -18,7 +18,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # sourceOnce "$dir_of_tegonal_scripts/ci/jelastic/jelastic-utils.sh" # @@ -43,7 +43,7 @@ export TEGONAL_SCRIPTS_VERSION='v4.11.0-SNAPSHOT' if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/parse-fn-args.sh" diff --git a/src/qa/run-shellcheck-pull-hooks.doc.sh b/src/qa/run-shellcheck-pull-hooks.doc.sh index bd7f7692..141635d4 100644 --- a/src/qa/run-shellcheck-pull-hooks.doc.sh +++ b/src/qa/run-shellcheck-pull-hooks.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" source "$dir_of_tegonal_scripts/qa/run-shellcheck-pull-hooks.sh" diff --git a/src/qa/run-shellcheck-pull-hooks.sh b/src/qa/run-shellcheck-pull-hooks.sh index 8d387ffa..8ed671b2 100755 --- a/src/qa/run-shellcheck-pull-hooks.sh +++ b/src/qa/run-shellcheck-pull-hooks.sh @@ -19,7 +19,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # source "$dir_of_tegonal_scripts/qa/run-shellcheck-pull-hooks.sh" # @@ -33,7 +33,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/qa/run-shellcheck.sh" diff --git a/src/qa/run-shellcheck.doc.sh b/src/qa/run-shellcheck.doc.sh index 016c0d29..25015b19 100644 --- a/src/qa/run-shellcheck.doc.sh +++ b/src/qa/run-shellcheck.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" source "$dir_of_tegonal_scripts/qa/run-shellcheck.sh" diff --git a/src/qa/run-shellcheck.sh b/src/qa/run-shellcheck.sh index c309e443..5f7a73e3 100755 --- a/src/qa/run-shellcheck.sh +++ b/src/qa/run-shellcheck.sh @@ -19,7 +19,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # source "$dir_of_tegonal_scripts/qa/run-shellcheck.sh" # @@ -43,7 +43,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/checks.sh" sourceOnce "$dir_of_tegonal_scripts/utility/recursive-declare-p.sh" diff --git a/src/qa/run-shellspec-if-installed.doc.sh b/src/qa/run-shellspec-if-installed.doc.sh index 18ec5caa..09276a71 100755 --- a/src/qa/run-shellspec-if-installed.doc.sh +++ b/src/qa/run-shellspec-if-installed.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" source "$dir_of_tegonal_scripts/qa/run-shellspec-if-installed.sh" diff --git a/src/qa/run-shellspec-if-installed.sh b/src/qa/run-shellspec-if-installed.sh index aef85d16..7ba84812 100755 --- a/src/qa/run-shellspec-if-installed.sh +++ b/src/qa/run-shellspec-if-installed.sh @@ -18,7 +18,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # source "$dir_of_tegonal_scripts/qa/run-shellspec-if-installed.sh" # @@ -34,7 +34,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/checks.sh" diff --git a/src/qa/run-shfmt.doc.sh b/src/qa/run-shfmt.doc.sh index 76fa936c..08f16754 100644 --- a/src/qa/run-shfmt.doc.sh +++ b/src/qa/run-shfmt.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" source "$dir_of_tegonal_scripts/qa/run-shfmt.sh" diff --git a/src/qa/run-shfmt.sh b/src/qa/run-shfmt.sh index 22344baa..e390659c 100755 --- a/src/qa/run-shfmt.sh +++ b/src/qa/run-shfmt.sh @@ -18,7 +18,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # source "$dir_of_tegonal_scripts/qa/run-shfmt.sh" # @@ -41,7 +41,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/checks.sh" sourceOnce "$dir_of_tegonal_scripts/utility/array-utils.sh" diff --git a/src/releasing/pre-release-checks-git.doc.sh b/src/releasing/pre-release-checks-git.doc.sh index acb0ca10..81c4a6ea 100755 --- a/src/releasing/pre-release-checks-git.doc.sh +++ b/src/releasing/pre-release-checks-git.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # checks releasing v0.1.0 makes sense and the current branch is main "$dir_of_tegonal_scripts/releasing/pre-release-checks-git.sh" -v v0.1.0 diff --git a/src/releasing/pre-release-checks-git.sh b/src/releasing/pre-release-checks-git.sh index 3a38eb2f..a0d107e0 100755 --- a/src/releasing/pre-release-checks-git.sh +++ b/src/releasing/pre-release-checks-git.sh @@ -22,7 +22,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # # checks releasing v0.1.0 makes sense and the current branch is main # "$dir_of_tegonal_scripts/releasing/pre-release-checks-git.sh" -v v0.1.0 @@ -38,7 +38,7 @@ export TEGONAL_SCRIPTS_VERSION='v4.11.0-SNAPSHOT' if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/ask.sh" sourceOnce "$dir_of_tegonal_scripts/utility/git-utils.sh" diff --git a/src/releasing/prepare-files-next-dev-cycle.doc.sh b/src/releasing/prepare-files-next-dev-cycle.doc.sh index 03239b01..fc8d0cec 100644 --- a/src/releasing/prepare-files-next-dev-cycle.doc.sh +++ b/src/releasing/prepare-files-next-dev-cycle.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" scriptsDir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)" sourceOnce "$scriptsDir/before-pr.sh" diff --git a/src/releasing/prepare-files-next-dev-cycle.sh b/src/releasing/prepare-files-next-dev-cycle.sh index 0b469744..0e67b893 100755 --- a/src/releasing/prepare-files-next-dev-cycle.sh +++ b/src/releasing/prepare-files-next-dev-cycle.sh @@ -20,7 +20,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # scriptsDir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)" # sourceOnce "$scriptsDir/before-pr.sh" @@ -64,7 +64,7 @@ export TEGONAL_SCRIPTS_VERSION='v4.11.0-SNAPSHOT' if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/execute-if-defined.sh" sourceOnce "$dir_of_tegonal_scripts/utility/parse-args.sh" diff --git a/src/releasing/prepare-next-dev-cycle-template.doc.sh b/src/releasing/prepare-next-dev-cycle-template.doc.sh index 09b26bd6..f45478a2 100644 --- a/src/releasing/prepare-next-dev-cycle-template.doc.sh +++ b/src/releasing/prepare-next-dev-cycle-template.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" function prepareNextAfterVersionUpdateHook() { # some additional version bumps e.g. using perl diff --git a/src/releasing/prepare-next-dev-cycle-template.sh b/src/releasing/prepare-next-dev-cycle-template.sh index 96af8eb5..d3c27b74 100755 --- a/src/releasing/prepare-next-dev-cycle-template.sh +++ b/src/releasing/prepare-next-dev-cycle-template.sh @@ -26,7 +26,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # function prepareNextAfterVersionUpdateHook() { # # some additional version bumps e.g. using perl @@ -64,7 +64,7 @@ export TEGONAL_SCRIPTS_VERSION='v4.11.0-SNAPSHOT' if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/execute-if-defined.sh" sourceOnce "$dir_of_tegonal_scripts/utility/git-utils.sh" diff --git a/src/releasing/release-files.doc.sh b/src/releasing/release-files.doc.sh index 34cfc6ef..b7e6604e 100644 --- a/src/releasing/release-files.doc.sh +++ b/src/releasing/release-files.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" scriptsDir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)" sourceOnce "$scriptsDir/before-pr.sh" diff --git a/src/releasing/release-files.sh b/src/releasing/release-files.sh index 8ac9f4fe..671bdb4f 100755 --- a/src/releasing/release-files.sh +++ b/src/releasing/release-files.sh @@ -24,7 +24,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # scriptsDir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)" # sourceOnce "$scriptsDir/before-pr.sh" @@ -79,7 +79,7 @@ export TEGONAL_SCRIPTS_VERSION='v4.11.0-SNAPSHOT' if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/execute-if-defined.sh" sourceOnce "$dir_of_tegonal_scripts/utility/gpg-utils.sh" diff --git a/src/releasing/release-template.doc.sh b/src/releasing/release-template.doc.sh index 7e20cfad..f7178f5a 100644 --- a/src/releasing/release-template.doc.sh +++ b/src/releasing/release-template.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" function releaseScalaLib() { sbt publishSigned diff --git a/src/releasing/release-template.sh b/src/releasing/release-template.sh index 3b8784b0..d42ce3c5 100755 --- a/src/releasing/release-template.sh +++ b/src/releasing/release-template.sh @@ -33,7 +33,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # function releaseScalaLib() { # sbt publishSigned @@ -84,7 +84,7 @@ export TEGONAL_SCRIPTS_VERSION='v4.11.0-SNAPSHOT' if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/execute-if-defined.sh" sourceOnce "$dir_of_tegonal_scripts/utility/parse-args.sh" diff --git a/src/releasing/sbt-publish-to-sonatype.doc.sh b/src/releasing/sbt-publish-to-sonatype.doc.sh index 3f160c97..4f482800 100644 --- a/src/releasing/sbt-publish-to-sonatype.doc.sh +++ b/src/releasing/sbt-publish-to-sonatype.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # ask for SONATYPE_USER and SONATYPE_PW (unless already exported beforehand) and calls sbt publishSigned "$dir_of_tegonal_scripts/releasing/sbt-publish-to-sonatype.sh" diff --git a/src/releasing/sbt-publish-to-sonatype.sh b/src/releasing/sbt-publish-to-sonatype.sh index e0dfa372..301e1702 100755 --- a/src/releasing/sbt-publish-to-sonatype.sh +++ b/src/releasing/sbt-publish-to-sonatype.sh @@ -19,7 +19,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # # ask for SONATYPE_USER and SONATYPE_PW (unless already exported beforehand) and calls sbt publishSigned # "$dir_of_tegonal_scripts/releasing/sbt-publish-to-sonatype.sh" @@ -42,7 +42,7 @@ export TEGONAL_SCRIPTS_VERSION='v4.11.0-SNAPSHOT' if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/log.sh" sourceOnce "$dir_of_tegonal_scripts/utility/ask.sh" diff --git a/src/releasing/sneak-peek-banner.doc.sh b/src/releasing/sneak-peek-banner.doc.sh index 97fb8ce4..abafe935 100644 --- a/src/releasing/sneak-peek-banner.doc.sh +++ b/src/releasing/sneak-peek-banner.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" "$dir_of_tegonal_scripts/releasing/sneak-peek-banner.sh" -c hide diff --git a/src/releasing/sneak-peek-banner.sh b/src/releasing/sneak-peek-banner.sh index 7b055ecd..9c49a0be 100755 --- a/src/releasing/sneak-peek-banner.sh +++ b/src/releasing/sneak-peek-banner.sh @@ -18,7 +18,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # "$dir_of_tegonal_scripts/releasing/sneak-peek-banner.sh" -c hide # @@ -36,7 +36,7 @@ export TEGONAL_SCRIPTS_VERSION='v4.11.0-SNAPSHOT' if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/parse-args.sh" diff --git a/src/releasing/toggle-sections.doc.sh b/src/releasing/toggle-sections.doc.sh index dc54aa47..38ff02f4 100644 --- a/src/releasing/toggle-sections.doc.sh +++ b/src/releasing/toggle-sections.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" "$dir_of_tegonal_scripts/releasing/toggle-sections.sh" -c main diff --git a/src/releasing/toggle-sections.sh b/src/releasing/toggle-sections.sh index 1d5dd60c..3f007da8 100755 --- a/src/releasing/toggle-sections.sh +++ b/src/releasing/toggle-sections.sh @@ -22,7 +22,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # "$dir_of_tegonal_scripts/releasing/toggle-sections.sh" -c main # @@ -40,7 +40,7 @@ export TEGONAL_SCRIPTS_VERSION='v4.11.0-SNAPSHOT' if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/parse-args.sh" diff --git a/src/releasing/update-version-README.doc.sh b/src/releasing/update-version-README.doc.sh index ef26ed51..0fdfb7f5 100644 --- a/src/releasing/update-version-README.doc.sh +++ b/src/releasing/update-version-README.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" "$dir_of_tegonal_scripts/releasing/update-version-README.sh" -v 0.1.0 diff --git a/src/releasing/update-version-README.sh b/src/releasing/update-version-README.sh index 83e49913..0c74537e 100755 --- a/src/releasing/update-version-README.sh +++ b/src/releasing/update-version-README.sh @@ -18,7 +18,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # "$dir_of_tegonal_scripts/releasing/update-version-README.sh" -v 0.1.0 # @@ -36,7 +36,7 @@ export TEGONAL_SCRIPTS_VERSION='v4.11.0-SNAPSHOT' if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/parse-args.sh" diff --git a/src/releasing/update-version-common-steps.doc.sh b/src/releasing/update-version-common-steps.doc.sh index c25249a5..e3e8543d 100644 --- a/src/releasing/update-version-common-steps.doc.sh +++ b/src/releasing/update-version-common-steps.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # updates the version in headers of different files, hides the sneak-peek banner and # toggles sections in README.md for release diff --git a/src/releasing/update-version-common-steps.sh b/src/releasing/update-version-common-steps.sh index 7486f8c3..f88b93f9 100755 --- a/src/releasing/update-version-common-steps.sh +++ b/src/releasing/update-version-common-steps.sh @@ -25,7 +25,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # # updates the version in headers of different files, hides the sneak-peek banner and # # toggles sections in README.md for release @@ -60,7 +60,7 @@ export TEGONAL_SCRIPTS_VERSION='v4.11.0-SNAPSHOT' if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/parse-args.sh" sourceOnce "$dir_of_tegonal_scripts/releasing/sneak-peek-banner.sh" diff --git a/src/releasing/update-version-issue-templates.doc.sh b/src/releasing/update-version-issue-templates.doc.sh index 4cd483c0..b508e5b7 100644 --- a/src/releasing/update-version-issue-templates.doc.sh +++ b/src/releasing/update-version-issue-templates.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" "$dir_of_tegonal_scripts/releasing/update-issue-templates.sh" -v 0.1.0 diff --git a/src/releasing/update-version-issue-templates.sh b/src/releasing/update-version-issue-templates.sh index ba62b9fd..5cd1395d 100755 --- a/src/releasing/update-version-issue-templates.sh +++ b/src/releasing/update-version-issue-templates.sh @@ -18,7 +18,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # "$dir_of_tegonal_scripts/releasing/update-issue-templates.sh" -v 0.1.0 # @@ -36,7 +36,7 @@ export TEGONAL_SCRIPTS_VERSION='v4.11.0-SNAPSHOT' if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/parse-args.sh" diff --git a/src/releasing/update-version-scripts.doc.sh b/src/releasing/update-version-scripts.doc.sh index 1dec46fa..dc38f5a1 100644 --- a/src/releasing/update-version-scripts.doc.sh +++ b/src/releasing/update-version-scripts.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" "$dir_of_tegonal_scripts/releasing/update-version-scripts.sh" -v 0.1.0 diff --git a/src/releasing/update-version-scripts.sh b/src/releasing/update-version-scripts.sh index 6eb66743..75c950ca 100755 --- a/src/releasing/update-version-scripts.sh +++ b/src/releasing/update-version-scripts.sh @@ -18,7 +18,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # "$dir_of_tegonal_scripts/releasing/update-version-scripts.sh" -v 0.1.0 # @@ -36,7 +36,7 @@ export TEGONAL_SCRIPTS_VERSION='v4.11.0-SNAPSHOT' if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/parse-args.sh" diff --git a/src/setup.sh.sig b/src/setup.sh.sig deleted file mode 100644 index 5aedec7978ff2ceda6f41cec5f20b812a818c70e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SW*e79j+b2bF<_W|iKl)X7+sU*;8%PF#fr0%-X5RR9VJ5R_l$ z6_8F`h0yL00G~jjne+^R_TdK^(Fz(h>;=qcp+F$UP(@1+iVGUP#kJ4@(nzsbC#P8|7{uZkQ%*&E z%SnIk2n+~$*r!xXwF}|)0iS75~F6r+#H{jOn ziOol5#@~aS%}7lAjdzp_IiKK*hVo+R*Vknfd{BkrnERow zzFkJk!kNy%mLVG+AueeJz3hECNNv>Ayy~5L-^}n{$v+_3vinp(n3}Yhw)?TM@hB)d zW75&X_y%X29M%z1zXKO7CC7(YiWvTd=#&n z`L1&MVQhpC(YOHI_e@6BT+L=CgSU5{C<{BBACB))dPDFr`KEBwhe(ry#bZDR8pM=~ zz{ejS+X0?`O=maI5dhaZS+I??EFxMPL+xb6U5i-2m-^*0YUAjMS9YtZiu#$+;5I{) E|IiE/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/io.sh" diff --git a/src/setup.sh b/src/setup_tegonal_scripts.sh similarity index 90% rename from src/setup.sh rename to src/setup_tegonal_scripts.sh index abfad067..6af0eb05 100644 --- a/src/setup.sh +++ b/src/setup_tegonal_scripts.sh @@ -21,7 +21,7 @@ # # Assumes your script is in (root is project folder) e.g. /src or /scripts and # # the tegonal scripts have been pulled via gt and put into /lib/tegonal-scripts # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # fi # # sourceOnce "$dir_of_tegonal_scripts/utility/io.sh" @@ -36,11 +36,11 @@ declare -A TEGONAL_SCRIPTS_SUPPRESSED_DEPRECATION=() # shellcheck disable=SC2034 # global var used in log.sh declare TEGONAL_SCRIPTS_ERROR_ON_DEPRECATION=true -#TODO 5.0.0 rename file to setup_tegonal_scripts.sh -- this way consumers will not run into shellcheck issues when they name a file setup.sh as well +#TODO 5.0.0 rename file to setup_tegonal_scripts.sh -- this way consumers will not run into shellcheck issues when they name a file setup_tegonal_scripts.sh as well if (($# != 1)); then printf >&2 "\033[0;31mERROR\033[0m: You need to pass the path to the tegonal scripts directory as first argument. Following an example\n" - echo >&2 "source \"\$dir_of_tegonal_scripts/setup.sh\" \"\$dir_of_tegonal_scripts\"" + echo >&2 "source \"\$dir_of_tegonal_scripts/setup_tegonal_scripts.sh\" \"\$dir_of_tegonal_scripts\"" exit 9 fi diff --git a/src/utility/array-utils.doc.sh b/src/utility/array-utils.doc.sh index 1b0e5e90..40b31b60 100644 --- a/src/utility/array-utils.doc.sh +++ b/src/utility/array-utils.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/array-utils.sh" diff --git a/src/utility/array-utils.sh b/src/utility/array-utils.sh index 1d5d5492..96175a00 100644 --- a/src/utility/array-utils.sh +++ b/src/utility/array-utils.sh @@ -18,7 +18,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # sourceOnce "$dir_of_tegonal_scripts/utility/array-utils.sh" # @@ -57,7 +57,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/checks.sh" diff --git a/src/utility/ask.doc.sh b/src/utility/ask.doc.sh index a8709ca9..9bfec011 100644 --- a/src/utility/ask.doc.sh +++ b/src/utility/ask.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/ask.sh" diff --git a/src/utility/ask.sh b/src/utility/ask.sh index dd59cfd6..25fb09d2 100644 --- a/src/utility/ask.sh +++ b/src/utility/ask.sh @@ -18,7 +18,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # sourceOnce "$dir_of_tegonal_scripts/utility/ask.sh" # @@ -42,7 +42,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/parse-utils.sh" diff --git a/src/utility/checks.doc.sh b/src/utility/checks.doc.sh index 6fd81a09..5c8453f6 100644 --- a/src/utility/checks.doc.sh +++ b/src/utility/checks.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/checks.sh" diff --git a/src/utility/checks.sh b/src/utility/checks.sh index 739eb70f..2668a3d4 100644 --- a/src/utility/checks.sh +++ b/src/utility/checks.sh @@ -19,7 +19,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # sourceOnce "$dir_of_tegonal_scripts/utility/checks.sh" # @@ -90,7 +90,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/parse-fn-args.sh" sourceOnce "$dir_of_tegonal_scripts/utility/recursive-declare-p.sh" diff --git a/src/utility/cleanups.doc.sh b/src/utility/cleanups.doc.sh index d606ca88..c680a396 100644 --- a/src/utility/cleanups.doc.sh +++ b/src/utility/cleanups.doc.sh @@ -6,7 +6,7 @@ projectDir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2> # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$projectDir/lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/cleanups.sh" diff --git a/src/utility/cleanups.sh b/src/utility/cleanups.sh index 88a888c5..8e7d7ca1 100644 --- a/src/utility/cleanups.sh +++ b/src/utility/cleanups.sh @@ -22,7 +22,7 @@ # # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$projectDir/lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # sourceOnce "$dir_of_tegonal_scripts/utility/cleanups.sh" # @@ -39,7 +39,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi function removeUnusedSignatures() { diff --git a/src/utility/date-utils.doc.sh b/src/utility/date-utils.doc.sh index 8badc155..5b8600be 100755 --- a/src/utility/date-utils.doc.sh +++ b/src/utility/date-utils.doc.sh @@ -6,7 +6,7 @@ projectDir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2> # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$projectDir/lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/date-utils.sh" diff --git a/src/utility/date-utils.sh b/src/utility/date-utils.sh index fcf5a251..d5f2e251 100644 --- a/src/utility/date-utils.sh +++ b/src/utility/date-utils.sh @@ -21,7 +21,7 @@ # # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$projectDir/lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # sourceOnce "$dir_of_tegonal_scripts/utility/date-utils.sh" # @@ -59,7 +59,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/parse-fn-args.sh" diff --git a/src/utility/execute-if-defined.doc.sh b/src/utility/execute-if-defined.doc.sh index 2d887005..ef318f3a 100644 --- a/src/utility/execute-if-defined.doc.sh +++ b/src/utility/execute-if-defined.doc.sh @@ -5,7 +5,7 @@ MY_LIB_VERSION="v1.1.0" # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/execute-if-defined.sh" diff --git a/src/utility/execute-if-defined.sh b/src/utility/execute-if-defined.sh index 2a0eeacd..9e782277 100644 --- a/src/utility/execute-if-defined.sh +++ b/src/utility/execute-if-defined.sh @@ -22,7 +22,7 @@ # # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # sourceOnce "$dir_of_tegonal_scripts/utility/execute-if-defined.sh" # @@ -51,7 +51,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/checks.sh" diff --git a/src/utility/git-utils.doc.sh b/src/utility/git-utils.doc.sh index 71c540b8..8d14800e 100644 --- a/src/utility/git-utils.doc.sh +++ b/src/utility/git-utils.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/git-utils.sh" diff --git a/src/utility/git-utils.sh b/src/utility/git-utils.sh index f6012f65..11e1899d 100644 --- a/src/utility/git-utils.sh +++ b/src/utility/git-utils.sh @@ -18,7 +18,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # sourceOnce "$dir_of_tegonal_scripts/utility/git-utils.sh" # @@ -70,7 +70,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/parse-fn-args.sh" sourceOnce "$dir_of_tegonal_scripts/utility/string-utils.sh" diff --git a/src/utility/gpg-utils.doc.sh b/src/utility/gpg-utils.doc.sh index b891fe3a..c8479de3 100644 --- a/src/utility/gpg-utils.doc.sh +++ b/src/utility/gpg-utils.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/gpg-utils.sh" diff --git a/src/utility/gpg-utils.sh b/src/utility/gpg-utils.sh index 370dbcb0..54b1f647 100644 --- a/src/utility/gpg-utils.sh +++ b/src/utility/gpg-utils.sh @@ -18,7 +18,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # sourceOnce "$dir_of_tegonal_scripts/utility/gpg-utils.sh" # @@ -83,7 +83,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/ask.sh" sourceOnce "$dir_of_tegonal_scripts/utility/parse-fn-args.sh" diff --git a/src/utility/http.doc.sh b/src/utility/http.doc.sh index 58f2a63b..da837b31 100644 --- a/src/utility/http.doc.sh +++ b/src/utility/http.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/http.sh" diff --git a/src/utility/http.sh b/src/utility/http.sh index 1b815a64..abb44562 100644 --- a/src/utility/http.sh +++ b/src/utility/http.sh @@ -18,7 +18,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # sourceOnce "$dir_of_tegonal_scripts/utility/http.sh" # @@ -33,7 +33,7 @@ export TEGONAL_SCRIPTS_VERSION='v4.11.0-SNAPSHOT' if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi function wgetAndVerify() { diff --git a/src/utility/io.doc.sh b/src/utility/io.doc.sh index 926fa728..4dc14641 100644 --- a/src/utility/io.doc.sh +++ b/src/utility/io.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/io.sh" diff --git a/src/utility/io.sh b/src/utility/io.sh index 806aa858..d62d4a7e 100644 --- a/src/utility/io.sh +++ b/src/utility/io.sh @@ -18,7 +18,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # sourceOnce "$dir_of_tegonal_scripts/utility/io.sh" # @@ -45,7 +45,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/checks.sh" diff --git a/src/utility/log.doc.sh b/src/utility/log.doc.sh index a031a02a..daeea3eb 100644 --- a/src/utility/log.doc.sh +++ b/src/utility/log.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/log.sh" diff --git a/src/utility/log.sh b/src/utility/log.sh index cd485857..e27977c3 100644 --- a/src/utility/log.sh +++ b/src/utility/log.sh @@ -20,7 +20,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # sourceOnce "$dir_of_tegonal_scripts/utility/log.sh" # @@ -154,7 +154,7 @@ function logDeprecation() { function suppressDeprecation() { local -r id=$1 - # shellcheck disable=SC2034 # global var defined in setup.sh + # shellcheck disable=SC2034 # global var defined in setup_tegonal_scripts.sh TEGONAL_SCRIPTS_SUPPRESSED_DEPRECATION[id]=1 } diff --git a/src/utility/parse-args.doc.sh b/src/utility/parse-args.doc.sh index c081149d..5b92e6f4 100644 --- a/src/utility/parse-args.doc.sh +++ b/src/utility/parse-args.doc.sh @@ -5,7 +5,7 @@ MY_LIB_VERSION="v1.1.0" # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/parse-args.sh" diff --git a/src/utility/parse-args.sh b/src/utility/parse-args.sh index ed5863b3..bc53556e 100644 --- a/src/utility/parse-args.sh +++ b/src/utility/parse-args.sh @@ -23,7 +23,7 @@ # # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # sourceOnce "$dir_of_tegonal_scripts/utility/parse-args.sh" # @@ -71,7 +71,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/array-utils.sh" sourceOnce "$dir_of_tegonal_scripts/utility/ask.sh" diff --git a/src/utility/parse-commands.doc.sh b/src/utility/parse-commands.doc.sh index 750e5e94..cac2e5ec 100644 --- a/src/utility/parse-commands.doc.sh +++ b/src/utility/parse-commands.doc.sh @@ -5,7 +5,7 @@ MY_LIB_VERSION="v1.1.0" # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" sourceOnce "$dir_of_tegonal_scripts/utility/parse-commands.sh" diff --git a/src/utility/parse-commands.sh b/src/utility/parse-commands.sh index 9a555f4f..518f6c25 100644 --- a/src/utility/parse-commands.sh +++ b/src/utility/parse-commands.sh @@ -24,7 +24,7 @@ # # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # sourceOnce "$dir_of_tegonal_scripts/utility/parse-commands.sh" # @@ -68,7 +68,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/array-utils.sh" sourceOnce "$dir_of_tegonal_scripts/utility/checks.sh" diff --git a/src/utility/parse-fn-args.doc.sh b/src/utility/parse-fn-args.doc.sh index d8d6b7d9..1bead3d3 100644 --- a/src/utility/parse-fn-args.doc.sh +++ b/src/utility/parse-fn-args.doc.sh @@ -5,7 +5,7 @@ shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors abov if ! [[ -v dir_of_tegonal_scripts ]]; then # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/parse-fn-args.sh" diff --git a/src/utility/parse-fn-args.sh b/src/utility/parse-fn-args.sh index 26bdf500..e036fec4 100644 --- a/src/utility/parse-fn-args.sh +++ b/src/utility/parse-fn-args.sh @@ -20,7 +20,7 @@ # if ! [[ -v dir_of_tegonal_scripts ]]; then # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # fi # sourceOnce "$dir_of_tegonal_scripts/utility/parse-fn-args.sh" # @@ -59,7 +59,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/checks.sh" diff --git a/src/utility/parse-utils.doc.sh b/src/utility/parse-utils.doc.sh index fa4f4181..67ddb93b 100644 --- a/src/utility/parse-utils.doc.sh +++ b/src/utility/parse-utils.doc.sh @@ -6,7 +6,7 @@ MY_LIBRARY_VERSION="v1.0.3" if ! [[ -v dir_of_tegonal_scripts ]]; then # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/parse-utils.sh" diff --git a/src/utility/parse-utils.sh b/src/utility/parse-utils.sh index 10146cd7..4bc5fb11 100644 --- a/src/utility/parse-utils.sh +++ b/src/utility/parse-utils.sh @@ -21,7 +21,7 @@ # if ! [[ -v dir_of_tegonal_scripts ]]; then # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # fi # sourceOnce "$dir_of_tegonal_scripts/utility/parse-utils.sh" # @@ -55,7 +55,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/checks.sh" diff --git a/src/utility/recursive-declare-p.doc.sh b/src/utility/recursive-declare-p.doc.sh index 053dca93..990a5aa9 100644 --- a/src/utility/recursive-declare-p.doc.sh +++ b/src/utility/recursive-declare-p.doc.sh @@ -5,7 +5,7 @@ shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors abov # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" source "$dir_of_tegonal_scripts/utility/recursive-declare-p.sh" diff --git a/src/utility/recursive-declare-p.sh b/src/utility/recursive-declare-p.sh index 212d9f9e..833611e0 100644 --- a/src/utility/recursive-declare-p.sh +++ b/src/utility/recursive-declare-p.sh @@ -22,7 +22,7 @@ # # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # source "$dir_of_tegonal_scripts/utility/recursive-declare-p.sh" # @@ -50,7 +50,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi function recursiveDeclareP() { diff --git a/src/utility/replace-help-snippet.doc.sh b/src/utility/replace-help-snippet.doc.sh index f196053c..21d86221 100644 --- a/src/utility/replace-help-snippet.doc.sh +++ b/src/utility/replace-help-snippet.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" source "$dir_of_tegonal_scripts/utility/replace-help-snippet.sh" diff --git a/src/utility/replace-help-snippet.sh b/src/utility/replace-help-snippet.sh index 9f25a978..83276e22 100644 --- a/src/utility/replace-help-snippet.sh +++ b/src/utility/replace-help-snippet.sh @@ -19,7 +19,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # source "$dir_of_tegonal_scripts/utility/replace-help-snippet.sh" # @@ -49,7 +49,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/checks.sh" sourceOnce "$dir_of_tegonal_scripts/utility/parse-fn-args.sh" diff --git a/src/utility/replace-snippet.doc.sh b/src/utility/replace-snippet.doc.sh index 54ef6cfe..1082eb2b 100644 --- a/src/utility/replace-snippet.doc.sh +++ b/src/utility/replace-snippet.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" source "$dir_of_tegonal_scripts/utility/replace-snippet.sh" diff --git a/src/utility/replace-snippet.sh b/src/utility/replace-snippet.sh index 56666840..324734ba 100644 --- a/src/utility/replace-snippet.sh +++ b/src/utility/replace-snippet.sh @@ -18,7 +18,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # source "$dir_of_tegonal_scripts/utility/replace-snippet.sh" # @@ -53,7 +53,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/parse-fn-args.sh" diff --git a/src/utility/secret-utils.doc.sh b/src/utility/secret-utils.doc.sh index d8e87df5..2f0c282d 100644 --- a/src/utility/secret-utils.doc.sh +++ b/src/utility/secret-utils.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" source "$dir_of_tegonal_scripts/utility/secret-utils.sh" diff --git a/src/utility/secret-utils.sh b/src/utility/secret-utils.sh index d0b54def..1fa94597 100755 --- a/src/utility/secret-utils.sh +++ b/src/utility/secret-utils.sh @@ -18,7 +18,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # source "$dir_of_tegonal_scripts/utility/secret-utils.sh" # @@ -48,7 +48,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/checks.sh" sourceOnce "$dir_of_tegonal_scripts/utility/parse-utils.sh" diff --git a/src/utility/source-once.doc.sh b/src/utility/source-once.doc.sh index c48ee562..276d8a6b 100644 --- a/src/utility/source-once.doc.sh +++ b/src/utility/source-once.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" source "$dir_of_tegonal_scripts/utility/source-once.sh" diff --git a/src/utility/source-once.sh b/src/utility/source-once.sh index ad25cf9e..ce08f2de 100644 --- a/src/utility/source-once.sh +++ b/src/utility/source-once.sh @@ -20,7 +20,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # source "$dir_of_tegonal_scripts/utility/source-once.sh" # diff --git a/src/utility/string-utils.doc.sh b/src/utility/string-utils.doc.sh index bf56e884..7ab48e6b 100644 --- a/src/utility/string-utils.doc.sh +++ b/src/utility/string-utils.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" source "$dir_of_tegonal_scripts/utility/string-utils.sh" diff --git a/src/utility/string-utils.sh b/src/utility/string-utils.sh index b422d7a4..12ea387d 100644 --- a/src/utility/string-utils.sh +++ b/src/utility/string-utils.sh @@ -18,7 +18,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # source "$dir_of_tegonal_scripts/utility/string-utils.sh" # @@ -37,7 +37,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi function escapeRegex() { diff --git a/src/utility/update-bash-docu.doc.sh b/src/utility/update-bash-docu.doc.sh index 6a9fca26..75bffca1 100644 --- a/src/utility/update-bash-docu.doc.sh +++ b/src/utility/update-bash-docu.doc.sh @@ -3,7 +3,7 @@ set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # Assumes tegonal's scripts were fetched with gt - adjust location accordingly dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" source "$dir_of_tegonal_scripts/utility/update-bash-docu.sh" diff --git a/src/utility/update-bash-docu.sh b/src/utility/update-bash-docu.sh index 9faae421..2e18db5b 100644 --- a/src/utility/update-bash-docu.sh +++ b/src/utility/update-bash-docu.sh @@ -24,7 +24,7 @@ # shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } # # Assumes tegonal's scripts were fetched with gt - adjust location accordingly # dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" -# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" # # source "$dir_of_tegonal_scripts/utility/update-bash-docu.sh" # @@ -43,7 +43,7 @@ unset CDPATH if ! [[ -v dir_of_tegonal_scripts ]]; then dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.." - source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" + source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh" "$dir_of_tegonal_scripts" fi sourceOnce "$dir_of_tegonal_scripts/utility/parse-fn-args.sh" sourceOnce "$dir_of_tegonal_scripts/utility/replace-snippet.sh" From 83181cf66ed9c07481f1ace5b4bbb9688987505d Mon Sep 17 00:00:00 2001 From: Robert Stoll Date: Wed, 25 Mar 2026 07:33:48 +0100 Subject: [PATCH 2/2] re-add setup.sh with a deprecation --- .github/ISSUE_TEMPLATE/bug_report.yaml | 1 + README.md | 11 ++++- src/setup.doc.sh | 12 ++++++ src/setup.sh | 56 ++++++++++++++++++++++++++ src/setup_tegonal_scripts.sh | 2 - src/utility/log.doc.sh | 7 ++++ src/utility/log.sh | 13 ++++-- 7 files changed, 95 insertions(+), 7 deletions(-) create mode 100644 src/setup.doc.sh create mode 100644 src/setup.sh diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 0b5dbbff..545f5146 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -65,6 +65,7 @@ body: - utility/secret-utils.sh - utility/source-once.sh - utility/update-bash-docu.sh + - setup.sh - setup_tegonal_scripts.sh validations: required: false diff --git a/README.md b/README.md index de4f3f1c..83c63c0a 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ gt pull -r tegonal-scripts -t "$TEGONAL_SCRIPTS_VERSION" -p src/utility/ We recommend you use the following code at the beginning of your script in case you want to `source` a file/function (in the example below we want to use tegonal's io functions located in `utility/io.sh`): - + ```bash @@ -92,7 +92,7 @@ fi sourceOnce "$dir_of_tegonal_scripts/utility/io.sh" ``` - + Note that `source "$dir_of_tegonal_scripts/setup_tegonal_scripts.sh"` will automatically source `utility/source-once.sh` and `utility/log.sh` @@ -1783,6 +1783,13 @@ printStackTrace # foo @ /opt/foo.sh:32:1 # bar @ /opt/bar.sh:10:1 # main @ /opt/main.sh:4:1 + +# true per default, set to false if you only want to see warnings but not fail on (new) deprecations +export TEGONAL_SCRIPTS_ERROR_ON_DEPRECATION=false +logDeprecation MY_DEPRECATION_ID "deprecation message" + +# suppress a particular deprecation +suppressDeprecation MY_DEPRECATION_ID ``` diff --git a/src/setup.doc.sh b/src/setup.doc.sh new file mode 100644 index 00000000..00571752 --- /dev/null +++ b/src/setup.doc.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +set -euo pipefail +shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } + +if ! [[ -v dir_of_tegonal_scripts ]]; then + # Assumes your script is in (root is project folder) e.g. /src or /scripts and + # the tegonal scripts have been pulled via gt and put into /lib/tegonal-scripts + dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" + source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +fi + +sourceOnce "$dir_of_tegonal_scripts/utility/io.sh" diff --git a/src/setup.sh b/src/setup.sh new file mode 100644 index 00000000..2e7e4a56 --- /dev/null +++ b/src/setup.sh @@ -0,0 +1,56 @@ +#!/usr/bin/env bash +# +# __ __ +# / /____ ___ ____ ___ ___ _/ / This script is provided to you by https://github.com/tegonal/scripts +# / __/ -_) _ `/ _ \/ _ \/ _ `/ / Copyright 2022 Tegonal Genossenschaft +# \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0 +# /___/ Please report bugs and contribute back your improvements +# +# Version: v4.11.0-SNAPSHOT +####### Description ############# +# +# Deprecated: script which sets up variables and functions for tegonal's scripts -> use setup_tegonal_scripts.sh instead +# +####### Usage ################### +# +# #!/usr/bin/env bash +# set -euo pipefail +# shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } +# +# if ! [[ -v dir_of_tegonal_scripts ]]; then +# # Assumes your script is in (root is project folder) e.g. /src or /scripts and +# # the tegonal scripts have been pulled via gt and put into /lib/tegonal-scripts +# dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src" +# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts" +# fi +# +# sourceOnce "$dir_of_tegonal_scripts/utility/io.sh" +# +################################### +set -euo pipefail +shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } +unset CDPATH + +# shellcheck disable=SC2034 # global var used in log.sh +declare -A TEGONAL_SCRIPTS_SUPPRESSED_DEPRECATION=() + +#TODO 5.0.0 rename file to setup_tegonal_scripts.sh -- this way consumers will not run into shellcheck issues when they name a file setup_tegonal_scripts.sh as well + +if (($# != 1)); then + printf >&2 "\033[0;31mERROR\033[0m: You need to pass the path to the tegonal scripts directory as first argument. Following an example\n" + echo >&2 "source \"\$dir_of_tegonal_scripts/setup.sh\" \"\$dir_of_tegonal_scripts\"" + exit 9 +fi + +declare dir_of_tegonal_scripts +if ! dir_of_tegonal_scripts=$(realpath "$1"); then + printf >&2 "\033[0;31mERROR\033[0m: looks like the passed dir_of_tegonal_scripts is not a realpath: %s" "$1" + exit 9 +fi +readonly dir_of_tegonal_scripts +source "$dir_of_tegonal_scripts/utility/source-once.sh" + +logDeprecation SETUP_SH "please switch to source \"\$dir_of_tegonal_scripts/setup_tegonal_scripts.sh\" -- setup.sh will be removed with v5.0.0" + +# shellcheck disable=SC2034 # global var used in log.sh +declare TEGONAL_SCRIPTS_ERROR_ON_DEPRECATION=true diff --git a/src/setup_tegonal_scripts.sh b/src/setup_tegonal_scripts.sh index 6af0eb05..63a4a139 100644 --- a/src/setup_tegonal_scripts.sh +++ b/src/setup_tegonal_scripts.sh @@ -36,8 +36,6 @@ declare -A TEGONAL_SCRIPTS_SUPPRESSED_DEPRECATION=() # shellcheck disable=SC2034 # global var used in log.sh declare TEGONAL_SCRIPTS_ERROR_ON_DEPRECATION=true -#TODO 5.0.0 rename file to setup_tegonal_scripts.sh -- this way consumers will not run into shellcheck issues when they name a file setup_tegonal_scripts.sh as well - if (($# != 1)); then printf >&2 "\033[0;31mERROR\033[0m: You need to pass the path to the tegonal scripts directory as first argument. Following an example\n" echo >&2 "source \"\$dir_of_tegonal_scripts/setup_tegonal_scripts.sh\" \"\$dir_of_tegonal_scripts\"" diff --git a/src/utility/log.doc.sh b/src/utility/log.doc.sh index daeea3eb..76a630cd 100644 --- a/src/utility/log.doc.sh +++ b/src/utility/log.doc.sh @@ -63,3 +63,10 @@ printStackTrace # foo @ /opt/foo.sh:32:1 # bar @ /opt/bar.sh:10:1 # main @ /opt/main.sh:4:1 + +# true per default, set to false if you only want to see warnings but not fail on (new) deprecations +export TEGONAL_SCRIPTS_ERROR_ON_DEPRECATION=false +logDeprecation MY_DEPRECATION_ID "deprecation message" + +# suppress a particular deprecation +suppressDeprecation MY_DEPRECATION_ID diff --git a/src/utility/log.sh b/src/utility/log.sh index e27977c3..03744d12 100644 --- a/src/utility/log.sh +++ b/src/utility/log.sh @@ -81,6 +81,13 @@ # # bar @ /opt/bar.sh:10:1 # # main @ /opt/main.sh:4:1 # +# # true per default, set to false if you only want to see warnings but not fail on (new) deprecations +# export TEGONAL_SCRIPTS_ERROR_ON_DEPRECATION=false +# logDeprecation MY_DEPRECATION_ID "deprecation message" +# +# # suppress a particular deprecation +# suppressDeprecation MY_DEPRECATION_ID +# ################################### set -euo pipefail shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; } @@ -143,11 +150,11 @@ function logDeprecation() { shift 2 || traceAndDie "could not shift by 2" if ! [[ -v TEGONAL_SCRIPTS_SUPPRESSED_DEPRECATION["$id"] ]]; then - printf >&2 "\033[0;93mDEPRECATION WARNING\033[0m id \033[0;36m%s\033[0m $msg\n" "$id" "$@" + printf >&2 "\033[0;93mDEPRECATION WARNING\033[0m with id \033[0;36m%s\033[0m: $msg\n" "$id" "$@" printStackTrace >&2 2 - if [[ -v TEGONAL_SCRIPTS_ERROR_ON_DEPRECATION && $TEGONAL_SCRIPTS_ERROR_ON_DEPRECATION = "true" ]]; then - die "found a deprecation and TEGONAL_SCRIPTS_ERROR_ON_DEPRECATION=true was specified, dying..." + if [[ -v TEGONAL_SCRIPTS_ERROR_ON_DEPRECATION && $TEGONAL_SCRIPTS_ERROR_ON_DEPRECATION == "true" ]]; then + die "found the deprecation %s (not suppressed via suppressDeprecation '%s') and TEGONAL_SCRIPTS_ERROR_ON_DEPRECATION=true was specified, dying..." "$id" "$id" fi fi }