From 6fbf6335c70a1f4b0a153e75d48be53858b92bfa Mon Sep 17 00:00:00 2001 From: Robert Stoll Date: Tue, 15 Apr 2025 21:46:10 +0200 Subject: [PATCH] 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 | 84 +++++++++--------- 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 +- 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/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 +- 90 files changed, 170 insertions(+), 170 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 f1a2c034..a81ed30b 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -63,7 +63,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 e8d01c5e..33aebedb 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 ab9349df..2ebbda43 100644 --- a/README.md +++ b/README.md @@ -59,14 +59,14 @@ export TEGONAL_SCRIPTS_VERSION="v4.8.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.8.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/ ``` @@ -77,7 +77,7 @@ We recommend you use the following code at the beginning of your script in case - + ```bash #!/usr/bin/env bash set -euo pipefail @@ -87,7 +87,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" @@ -95,7 +95,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 @@ -212,7 +212,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' @@ -281,7 +281,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" @@ -320,7 +320,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" @@ -359,7 +359,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" @@ -430,7 +430,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" @@ -517,7 +517,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" @@ -618,7 +618,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 @@ -702,7 +702,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() { @@ -776,7 +776,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 @@ -814,7 +814,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" @@ -877,7 +877,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 @@ -965,7 +965,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 @@ -1024,7 +1024,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 @@ -1083,7 +1083,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 @@ -1156,7 +1156,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 @@ -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/sneak-peek-banner.sh" -c hide @@ -1241,7 +1241,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" @@ -1289,7 +1289,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" @@ -1325,7 +1325,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" @@ -1351,7 +1351,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" @@ -1434,7 +1434,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" @@ -1478,7 +1478,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" @@ -1539,7 +1539,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" @@ -1611,7 +1611,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" @@ -1632,7 +1632,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" @@ -1669,7 +1669,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" @@ -1756,7 +1756,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" @@ -1808,7 +1808,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" @@ -1854,7 +1854,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" @@ -1903,7 +1903,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" @@ -1941,7 +1941,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" @@ -1981,7 +1981,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" @@ -2025,7 +2025,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" @@ -2064,7 +2064,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" @@ -2104,7 +2104,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" @@ -2136,7 +2136,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 4a635d97..b1519f5c 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 fd1ad06b..7b11a2ec 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 9b043315..b5a9f710 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 cf351b02..a30e44be 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 ed140ba7..05b8db57 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 f6d558c3..5ed62ac0 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/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 62744ba7..6816d03c 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.9.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 bfdedbb6..f192e90f 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.9.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 4f746c57..25e68afe 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 5aeb9f5d..b95b7ba6 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 eb1b8a0d..14f9f31c 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/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 65d81317..9deb3846 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.9.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 e518f16d..c9a6558f 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 4b05d203..ee181a19 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.9.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 6e233b97..7769c294 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() { diff --git a/src/releasing/prepare-next-dev-cycle-template.sh b/src/releasing/prepare-next-dev-cycle-template.sh index 3401a9c4..a9a5574c 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() { @@ -65,7 +65,7 @@ export TEGONAL_SCRIPTS_VERSION='v4.9.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 66ccdad7..f46efed5 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 fd0bccfd..0edfe0a8 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" @@ -80,7 +80,7 @@ export TEGONAL_SCRIPTS_VERSION='v4.9.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 546ac192..df5270f0 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 3aa74bdd..58bd8109 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.9.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 8e0461b2..9a1cde08 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.9.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 56003057..59657c65 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.9.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 1e772ca0..4d57237e 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.9.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 129629e6..e0516625 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.9.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 b61c4a3e..54839079 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.9.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 3fc3b50f..16e97573 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.9.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 f5f1aadc..eba3851d 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.9.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 68629b78ace768d290284fe562402c137e440407..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SW*e79j+b2bF<_W|iKl)X7+sU*;8%PF#fr0%!gmssIWJ5R_l$ z6_8F`h2De@{xk}D{<@^z3*8(XEF-@K>J|Quxh@gc1dSLDU0fTk{lkvzKVNnhDCdy!^<8kwhEmY@R8}~Ljfab(YUIG-UStG? z38Nh*!>XM40&0x8jxUK~o2DtH&8k9 z(*u_t_QJB73x_!w)d94g@)|-LaW2|s)CyO1mL3Su7KeW11=2vXgN1P&TuA{&l#oX3 zBC5|e_Kni>ArM1ARQZNIPzw=i?A#-OeG^=(&`y4;B{m!9@gG;GT4RsOilT2J=!vL# zxD6D=J(%I}qKwSuP0K6$IIOcA-vaom6x>;Z$zupk6_Pmbn!YC`VF!g?NI+J-0h=Wz4K>uLwzQY zvYGk5d-%fMD`y440tiV>wjQ=Ac3CR3WaYt58gb<3Pkb|dA=Ni|Sv$=8^Z*t#I*{(W E!Vd!sAOHXW diff --git a/src/setup.doc.sh b/src/setup_tegonal_scripts.doc.sh similarity index 86% rename from src/setup.doc.sh rename to src/setup_tegonal_scripts.doc.sh index 00571752..86fa5451 100644 --- a/src/setup.doc.sh +++ b/src/setup_tegonal_scripts.doc.sh @@ -6,7 +6,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" 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 a24f07ba..28f021ff 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 0955cd7d..72425d06 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 ea96f8a5..462288e4 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 a472b117..08090277 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 f899def6..5773e9eb 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 894afb61..ba5414b5 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 66454d6e..2eaf25c7 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 f601ec65..c0a80d74 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 ea2ffec4..0a9b5cba 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 af35e406..c5bfc1bc 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 42075922..3ac6aa67 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 8458f769..0a5f04a7 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 f239ec7a..71d315b5 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.9.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 50c214b6..095f9bde 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 89bcc5c8..bd765cc7 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" # @@ -46,7 +46,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 0174a1fa..cef094dc 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 6d9e71ac..d6093d4d 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 bc6aa93d..72acd2d4 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 a4f35a16..0448e5b1 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 f6e5372e..b4822ea3 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 d46fa910..a61c9c30 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 d4a23417..ade88eb3 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 0b245ddd..c8c20ea4 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 44f9ab07..2705401a 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 2ff0c631..5669b95d 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 82ed9521..0e04b442 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 7a236fa2..99314c35 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 764ca058..94ad04a6 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 22d68483..9b918b94 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 8a5b7fa2..4b8a32bb 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 6b6c65ef..4d7e8646 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 46e6f1c1..ad4f10ff 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"