From ec1c4d9fbaa2931ea7afb4813aa4713d245b2766 Mon Sep 17 00:00:00 2001 From: tegonal-bot Date: Mon, 27 Jan 2025 04:07:14 +0000 Subject: [PATCH] update files of remote tegonal-scripts to version v4.3.0 via gt --- .gt/remotes/tegonal-scripts/pulled.tsv | 38 ++++++++--------- .../src/ci/install-shellcheck.sh | 32 +++++++++++---- lib/tegonal-scripts/src/qa/run-shellcheck.sh | 4 +- lib/tegonal-scripts/src/setup.sh | 2 +- .../src/utility/array-utils.sh | 2 +- lib/tegonal-scripts/src/utility/ask.sh | 2 +- lib/tegonal-scripts/src/utility/checks.sh | 41 +++++++++++++------ lib/tegonal-scripts/src/utility/git-utils.sh | 2 +- lib/tegonal-scripts/src/utility/gpg-utils.sh | 2 +- lib/tegonal-scripts/src/utility/io.sh | 4 +- lib/tegonal-scripts/src/utility/log.sh | 2 +- lib/tegonal-scripts/src/utility/parse-args.sh | 2 +- .../src/utility/parse-commands.sh | 2 +- .../src/utility/parse-fn-args.sh | 2 +- .../src/utility/parse-utils.sh | 2 +- .../src/utility/recursive-declare-p.sh | 2 +- .../src/utility/replace-help-snippet.sh | 4 +- .../src/utility/replace-snippet.sh | 2 +- .../src/utility/source-once.sh | 2 +- .../src/utility/update-bash-docu.sh | 2 +- 20 files changed, 90 insertions(+), 61 deletions(-) diff --git a/.gt/remotes/tegonal-scripts/pulled.tsv b/.gt/remotes/tegonal-scripts/pulled.tsv index a71db25..6e06d93 100644 --- a/.gt/remotes/tegonal-scripts/pulled.tsv +++ b/.gt/remotes/tegonal-scripts/pulled.tsv @@ -1,21 +1,21 @@ #@ Version: 1.1.0 tag file relativeTarget tagFilter sha512 -v4.2.0 src/setup.sh ../lib/tegonal-scripts/src/setup.sh .* ae5cb8feccad286063b22f33dc0bc5506a9d9982df756bb8fde8c6b3c8a853a44691777b66d6466b6b191bec3b86f98170dfc9ad566cdcec07c52d71c40f8efd -v4.2.0 src/utility/io.sh ../lib/tegonal-scripts/src/utility/io.sh .* c78a21387a128ef9452fbf74dcd30add6a0d0052cf38eb13c75b7ab34752165f3603f339943000097eef94045cd2c0718fd09b7ddf312cb0a89faa1607431006 -v4.2.0 src/utility/array-utils.sh ../lib/tegonal-scripts/src/utility/array-utils.sh .* 29b6bbf42196607474eb4b1975d1ef34a8767d3d51a94e68bfd0cdfcd3f1ea4b1bd008d3031fcb048e47934b7b53dec6b34b90557d264cf81f4b48ff935a49c3 -v4.2.0 src/utility/parse-utils.sh ../lib/tegonal-scripts/src/utility/parse-utils.sh .* 973fb0e9d9d85999518c63a69d802d29ead4b40fd5a0a8b2f97745e850426f7c22587f59ea2fb83a16e028fa4d6a60649f0cea19893be8f950a708c313626910 -v4.2.0 src/utility/git-utils.sh ../lib/tegonal-scripts/src/utility/git-utils.sh .* 49bf4c410457154a1d73e1f01e8a7ba6b0771c4b1e96f547f29acdfd46d4be667674fc6ef14204366eb43d414521a231eb0dfa1acb37e17fe8465b8b79bd84ba -v4.2.0 src/utility/gpg-utils.sh ../lib/tegonal-scripts/src/utility/gpg-utils.sh .* f867fe3fe2e5956951f3976d023550fdb78cbfc4aba283af74c457ecd60020f66c521a74283d6be5d1cf8e506966b9614d5a8b6d7b8275413cf8e43d8419f856 -v4.2.0 src/utility/log.sh ../lib/tegonal-scripts/src/utility/log.sh .* f1992f3bfc295bcc93b3b00213a018c938ba9d255d188d4f9a93409540d01b58f6240712692850240c6efed8c5693a39d950608d1e4b30de3ffffd9f1652be82 -v4.2.0 src/utility/parse-fn-args.sh ../lib/tegonal-scripts/src/utility/parse-fn-args.sh .* 9021c475366ffba18c30834d71f533d2f3ce2dc32d73499ad2c92a81daf3b676f33069e361122503d5b744a7bbd9a2f519ab54913e50df78cbe7e1dece0f87b4 -v4.2.0 src/utility/update-bash-docu.sh ../lib/tegonal-scripts/src/utility/update-bash-docu.sh .* aa867246f6118358a1e880e3bf6ba95c6289f25d8b36e8cc2c5116296c37f0a48a79f5ee8450e8e7df678b1d2a848acb0300042af7c4c40953bb8df61b858792 -v4.2.0 src/utility/parse-args.sh ../lib/tegonal-scripts/src/utility/parse-args.sh .* 8bd1221cc593df9f95f80197737f6453a5d45e8e2ea46ef5c1fad5a015c2d8b24328b728c69ec4e0f55f26fe45a53950e7206323ba1cd021772c186a3ce3bc1a -v4.2.0 src/utility/checks.sh ../lib/tegonal-scripts/src/utility/checks.sh .* 6a132a4666c23b5ee19e2f837e5d508ccf305ea26d128e583b1ef37ad04fb43174b3bfc6c89b8cd9b7ddddebbbb16940c4abe43b806fbfa1d4e765db33379209 -v4.2.0 src/utility/parse-commands.sh ../lib/tegonal-scripts/src/utility/parse-commands.sh .* bea8011d884f8faa7c9b9490f06d8a15237146cf5f6412ce0e9834aebea8cb6be5c152637a36eff5bc8e84b814fcd7abae785c590b4ad268638e699746fe9c4f -v4.2.0 src/utility/replace-snippet.sh ../lib/tegonal-scripts/src/utility/replace-snippet.sh .* 89fe82e7d795128ff77e900c77141b6557fc80ecca0e36cfccad9eaf26cde93feeee815b0c5adfa1767e0774f60e8d22517e25ebb44d31746eab0c7e279698c5 -v4.2.0 src/utility/ask.sh ../lib/tegonal-scripts/src/utility/ask.sh .* ea7dff5f11c7baf3cba668b64477e199b6667ba652e9b0940262985a05c9125cd2e3c952fab412302e0c1d44d522912b1280a2f33a40a8f5c4b3114397c35ccc -v4.2.0 src/utility/replace-help-snippet.sh ../lib/tegonal-scripts/src/utility/replace-help-snippet.sh .* 62f9946905407a9a93f4b6e7dfbe9ac8a372eed4bffe07d2e14e8a3882c6945eb151b06a70ddedc78e030674cd125fbb43338d78698b336e2a256559be8829a1 -v4.2.0 src/utility/source-once.sh ../lib/tegonal-scripts/src/utility/source-once.sh .* 6fcc981876e4839ba6edfabe84f2e440408ca646f8fe0e5d385b1dd119360dc58c7dd5945933eaf3fa8e43f18420fa53adad643d4d3feeba8b06b9d59ca45d53 -v4.2.0 src/utility/recursive-declare-p.sh ../lib/tegonal-scripts/src/utility/recursive-declare-p.sh .* 5476417a2cda2d99cb8f9bc9f5a84eed1605b9cc3463dd3e0eccddb73d6e86016d467a31b891e9adc14472f9b230287fa98b1365c443dd4b387b7ca23d67ef8c -v4.2.0 src/ci/install-shellcheck.sh ../lib/tegonal-scripts/src/ci/install-shellcheck.sh .* c22bea952143adc9679e07a3d9e20726b8cc4665b047ed7a800052ca60836676da4f158466e37bf3776207636a4dc291309cfd2c97327c6c39b10ae1687599d9 -v4.2.0 src/qa/run-shellcheck.sh ../lib/tegonal-scripts/src/qa/run-shellcheck.sh .* 7c9d7051848012bdcad2e8c8bfc37271ae8720fe81774abd7fbb10db6bc70ab5d967033deb784f320ebc006921508e7c248c349ec7c9183b5786d997bf85ee49 +v4.3.0 src/setup.sh ../lib/tegonal-scripts/src/setup.sh .* 4c724bc24173fa7918e2141c37d69ced5830509df4ee2bb274e70f9869f8a2a30815ce2bad0a9ac5c9771422db589d0f6759826b4ec3df97a23467118af35e7e +v4.3.0 src/utility/io.sh ../lib/tegonal-scripts/src/utility/io.sh .* 6922ada0ba1a2d3fec44561809e6f1140f614739538ef6b095a906a511fe4fcc978b63c285cabda0396dfbbe5b6c18455059aeaa2fe9a72135fdc9f9a7a21d15 +v4.3.0 src/utility/array-utils.sh ../lib/tegonal-scripts/src/utility/array-utils.sh .* 0dfad1e9f8e803239023e5424ac18659582b903a7832bdaa030bbf7ae9b484f9239b2d65fb225ab402a641ac9db4f978e878424f58a9aae7b2269185506df539 +v4.3.0 src/utility/parse-utils.sh ../lib/tegonal-scripts/src/utility/parse-utils.sh .* 5f2e1c323ebd12c50a693e4443c116aa48b88f6ddfe532ac9aa339ee6ecdf361ccf1fbebda019e16fb660ccfc5766d53292ef1899e937ab665d0a555fb7485e6 +v4.3.0 src/utility/git-utils.sh ../lib/tegonal-scripts/src/utility/git-utils.sh .* 5e0989121b6d144fbbf6054164fb0d90e1f9ad2354022f722c305117e721e4ff8977b5b578502852bd203f30b7da15180a5e36a6485a4c4b1c3220fda0f3f945 +v4.3.0 src/utility/gpg-utils.sh ../lib/tegonal-scripts/src/utility/gpg-utils.sh .* ca8b6ffbac35acfd6fe6cc6469ad2ab8de1aff941004601826ff65b77d8e3b73675cea44e6efdd2e86d79cd8e0202890527fbe94522abac966f1d6a4fe43c09a +v4.3.0 src/utility/log.sh ../lib/tegonal-scripts/src/utility/log.sh .* 9cbfcfbdba7ce8786a771abb032f54fdf91dc12bdbb44b3db4a9f9225cfd1db46cd5a885a898c97ae9bf1f0f12bd742e0b4baa213b3525935082cdd4f92a820c +v4.3.0 src/utility/parse-fn-args.sh ../lib/tegonal-scripts/src/utility/parse-fn-args.sh .* 8d462867e13d6a996a2e26560c439c4253c7fc91e9f4c8ec4476f10ff3fe82086de1f9bc1391ed1085e0db9309ecd8cc65d55313d466f39d9a4ff78183419f92 +v4.3.0 src/utility/update-bash-docu.sh ../lib/tegonal-scripts/src/utility/update-bash-docu.sh .* 2f46bf099b591230dc822ecb7506c5de121bb9dda87b45c218e3bf3e20a473c2eaa20c2042a58bc67a9baeb47d622f8cfffbabe2b4d8195a368d3887ed75cffc +v4.3.0 src/utility/parse-args.sh ../lib/tegonal-scripts/src/utility/parse-args.sh .* a203ca483f01fb71d06b49f071fadb846a88d7eae598dbffd594188a5bc5dd0c613670c9c1755976b83ada958d523f4a3444f6e756e777e77d4e272ac6dc0d64 +v4.3.0 src/utility/checks.sh ../lib/tegonal-scripts/src/utility/checks.sh .* b5d1103bd49ef05453ddc24f5445e811592636bec1ae4472820f6e7fc027f69608343c371ac1c96d800d8cb866d01e275ab69613989a704041b4443a3fe755c2 +v4.3.0 src/utility/parse-commands.sh ../lib/tegonal-scripts/src/utility/parse-commands.sh .* b7468e87749670e93ea7498e22b2ac60ad27cf561fba159a541df8832d50685feae12300144635e5e7139478496333a882b90b4cc8ed2a530fdddc0ffd01b5e0 +v4.3.0 src/utility/replace-snippet.sh ../lib/tegonal-scripts/src/utility/replace-snippet.sh .* 92ab9e494b686619649df7b297cb316865ed9e3ebb85ef2c16143289901ab4cd5fd14b1ce775a38c62ad99366e5cc4cf893ebb23018ee2b5b4cef74392bc50e8 +v4.3.0 src/utility/ask.sh ../lib/tegonal-scripts/src/utility/ask.sh .* 8fa9c70962f7f5f93313a5cc9e5e09aa68bde106d00a8e1d8416c97baa890e61a24ddba4df81e815a4370c14c31501cc90cd95f28fba64df998586c4798155b0 +v4.3.0 src/utility/replace-help-snippet.sh ../lib/tegonal-scripts/src/utility/replace-help-snippet.sh .* 99143ad9e7f9935e967db796d213aca9f8cedd34f94902923f93fa105742a8e3f28b6dd1a58015ff01efd9d89089e2e125a2eb59902404621ee78b48b0c994d5 +v4.3.0 src/utility/source-once.sh ../lib/tegonal-scripts/src/utility/source-once.sh .* 8e7cf2ae70755d521e09c17ff82778208bc6cc2abacdf19109de7b3b44789b633c2f4858e6d2ea5cdede6920b419a57b82525f6001af4877637989d2572c3868 +v4.3.0 src/utility/recursive-declare-p.sh ../lib/tegonal-scripts/src/utility/recursive-declare-p.sh .* ba3aa16d17e2ee36d4338574edfe8f96e478673a5ab4941f6b7ed938c8d913e0fcf5040fad9edb15dc1de181b8e973ef4e806f37e82357076df75250fbdf2313 +v4.3.0 src/ci/install-shellcheck.sh ../lib/tegonal-scripts/src/ci/install-shellcheck.sh .* 213f37ebd8ac5a9fa04d8654ef75c6a28ea6c56af78b5274b2ec392f61f6df0a322711a1ec68460c0c419867c839138ac8bf06b760b59254c968be488018bb88 +v4.3.0 src/qa/run-shellcheck.sh ../lib/tegonal-scripts/src/qa/run-shellcheck.sh .* da94dacee0bf2432816eb097e228ccf5f5c863b322f5a59bb9581ced23a886d8a713a3e38cce4e47882517de4f275d66ac60fcf75345e0ad2744113084ec06dd diff --git a/lib/tegonal-scripts/src/ci/install-shellcheck.sh b/lib/tegonal-scripts/src/ci/install-shellcheck.sh index 51ae845..494d013 100755 --- a/lib/tegonal-scripts/src/ci/install-shellcheck.sh +++ b/lib/tegonal-scripts/src/ci/install-shellcheck.sh @@ -6,11 +6,10 @@ # \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0 # /___/ Please report bugs and contribute back your improvements # -# Version: v4.2.0 +# Version: v4.3.0 ####### Description ############# # -# function which searches for *.sh files within defined paths (directories or a single *.sh) and -# runs shellcheck on each file with predefined settings i.a. sets `-s bash` +# installs shellcheck v0.10.0 into $HOME/.local/lib # ####### Usage ################### # @@ -35,12 +34,27 @@ declare currentDir currentDir=$(pwd) tmpDir=$(mktemp -d -t download-shellcheck-XXXXXXXXXX) cd "$tmpDir" -echo "6c881ab0698e4e6ea235245f22832860544f17ba386442fe7e9d629f8cbedf87 ./shellcheck-v0.10.0.linux.x86_64.tar.xz" >shellcheck-v0.10.0.linux.x86_64.tar.xz.sha256 -wget --no-verbose https://github.com/koalaman/shellcheck/releases/download/v0.10.0/shellcheck-v0.10.0.linux.x86_64.tar.xz -sha256sum -c shellcheck-v0.10.0.linux.x86_64.tar.xz.sha256 -tar -xf ./shellcheck-v0.10.0.linux.x86_64.tar.xz -chmod +x ./shellcheck-v0.10.0/shellcheck +shellcheckVersion="v0.10.0" +echo "6c881ab0698e4e6ea235245f22832860544f17ba386442fe7e9d629f8cbedf87 ./shellcheck-$shellcheckVersion.linux.x86_64.tar.xz" >"shellcheck-$shellcheckVersion.linux.x86_64.tar.xz.sha256" +wget --no-verbose "https://github.com/koalaman/shellcheck/releases/download/$shellcheckVersion/shellcheck-$shellcheckVersion.linux.x86_64.tar.xz" +sha256sum -c "shellcheck-$shellcheckVersion.linux.x86_64.tar.xz.sha256" +tar -xf "./shellcheck-$shellcheckVersion.linux.x86_64.tar.xz" +chmod +x "./shellcheck-$shellcheckVersion/shellcheck" mkdir -p "$HOME/.local/bin" -ln -s "$tmpDir/shellcheck-v0.10.0/shellcheck" "$HOME/.local/bin/shellcheck" +shellcheckInTmp="$tmpDir/shellcheck-$shellcheckVersion" +shellcheckInHomeLocalLib="$HOME/.local/lib/shellcheck-$shellcheckVersion" +shellcheckBin="$HOME/.local/bin/shellcheck" +if [[ -d "$shellcheckInHomeLocalLib" ]]; then + echo "going to remove the existing installation in $shellcheckInHomeLocalLib" + rm -r "$shellcheckInHomeLocalLib" +else + mkdir -p "$HOME/.local/lib" +fi +mv "$shellcheckInTmp" "$shellcheckInHomeLocalLib" +if [[ -f "$shellcheckBin" ]]; then + rm "$shellcheckBin" +fi +ln -s "$shellcheckInHomeLocalLib/shellcheck" "$shellcheckBin" + cd "$currentDir" shellcheck --version diff --git a/lib/tegonal-scripts/src/qa/run-shellcheck.sh b/lib/tegonal-scripts/src/qa/run-shellcheck.sh index f6d44e4..cba3202 100755 --- a/lib/tegonal-scripts/src/qa/run-shellcheck.sh +++ b/lib/tegonal-scripts/src/qa/run-shellcheck.sh @@ -6,7 +6,7 @@ # \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0 # /___/ Please report bugs and contribute back your improvements # -# Version: v4.2.0 +# Version: v4.3.0 ####### Description ############# # # function which searches for *.sh files within defined paths (directories or a single *.sh) and @@ -46,7 +46,7 @@ sourceOnce "$dir_of_tegonal_scripts/utility/recursive-declare-p.sh" sourceOnce "$dir_of_tegonal_scripts/utility/array-utils.sh" function runShellcheck() { - exitIfCommandDoesNotExist "shellcheck" "see https://github.com/koalaman/shellcheck#installing" + exitIfCommandDoesNotExist "shellcheck" "execute $dir_of_tegonal_scripts/ci/install-shellcheck.sh (if pulled) or see https://github.com/koalaman/shellcheck#installing" if (($# < 2)); then logError "At least two parameters need to be passed to runShellcheck, given \033[0;36m%s\033[0m\nFollowing a description of the parameters:" "$#" diff --git a/lib/tegonal-scripts/src/setup.sh b/lib/tegonal-scripts/src/setup.sh index d603c10..38d9a04 100644 --- a/lib/tegonal-scripts/src/setup.sh +++ b/lib/tegonal-scripts/src/setup.sh @@ -6,7 +6,7 @@ # \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0 # /___/ Please report bugs and contribute back your improvements # -# Version: v4.2.0 +# Version: v4.3.0 ####### Description ############# # # script which should be sourced and sets up variables and functions for the scripts diff --git a/lib/tegonal-scripts/src/utility/array-utils.sh b/lib/tegonal-scripts/src/utility/array-utils.sh index 93801c3..bef5fff 100644 --- a/lib/tegonal-scripts/src/utility/array-utils.sh +++ b/lib/tegonal-scripts/src/utility/array-utils.sh @@ -6,7 +6,7 @@ # \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0 # /___/ Please report bugs and contribute back your improvements # -# Version: v4.2.0 +# Version: v4.3.0 ####### Description ############# # # utility functions for dealing with arrays diff --git a/lib/tegonal-scripts/src/utility/ask.sh b/lib/tegonal-scripts/src/utility/ask.sh index e20c175..0464a7b 100644 --- a/lib/tegonal-scripts/src/utility/ask.sh +++ b/lib/tegonal-scripts/src/utility/ask.sh @@ -6,7 +6,7 @@ # \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0 # /___/ Please report bugs and contribute back your improvements # -# Version: v4.2.0 +# Version: v4.3.0 ####### Description ############# # # Utility functions to ask the user something via input. diff --git a/lib/tegonal-scripts/src/utility/checks.sh b/lib/tegonal-scripts/src/utility/checks.sh index 638436a..695c5f1 100644 --- a/lib/tegonal-scripts/src/utility/checks.sh +++ b/lib/tegonal-scripts/src/utility/checks.sh @@ -7,7 +7,7 @@ # \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0 # /___/ Please report bugs and contribute back your improvements # -# Version: v4.2.0 +# Version: v4.3.0 ####### Description ############# # # Functions to check declarations @@ -106,7 +106,7 @@ function checkArgIsArray() { reg='^declare -a.*' local arrayDefinition # we are not failing (with || die...) on this line as the if will fail afterwards - arrayDefinition="$(recursiveDeclareP checkArgIsArray_arr)" + arrayDefinition="$(recursiveDeclareP checkArgIsArray_arr)" || traceAndDie "could not get array definition of %s" "${!checkArgIsArray_arr}" if ! [[ $arrayDefinition =~ $reg ]]; then local funcName=${FUNCNAME[1]} if [[ $funcName == "exitIfArgIsNotArray" ]]; then @@ -216,7 +216,7 @@ function checkArgIsFunction() { local name argNumberOrName # shellcheck disable=SC2034 # is passed by name to parseFnArgs local -ra params=(name argNumberOrName) - parseFnArgs params "$@" + parseFnArgs params "$@" || return $? if ! declare -F "$name" >/dev/null; then local declareP @@ -239,7 +239,7 @@ function checkArgIsBoolean() { local value argNumberOrName # shellcheck disable=SC2034 # is passed by name to parseFnArgs local -ra params=(value argNumberOrName) - parseFnArgs params "$@" + parseFnArgs params "$@" || return $? if ! [[ $value =~ ^(true|false)$ ]]; then local funcName=${FUNCNAME[1]} @@ -316,21 +316,36 @@ function exitIfVariablesNotDeclared() { done } +function checkPathIsInsideOf() { + if ! (($# == 2)); then + logError "Two arguments needs to be passed to checkPathIsInsideOf, given \033[0;36m%s\033[0m\n" "$#" + echo >&2 '1: pathToCheck the path which should be inside of rootDir' + echo >&2 '2: rootDir the root directory' + printStackTrace + exit 9 + + fi + local path=$1 + local rootDir=$2 + local pathAbsolute rootDirectoryAbsolute + pathAbsolute="$(realpath -m "$path")" || return $? + rootDirectoryAbsolute="$(realpath -m "$rootDir")" || return $? + [[ "$pathAbsolute" == "$rootDirectoryAbsolute"* ]] +} + function checkPathNamedIsInsideOf() { - local path name parentDirectory + local path name rootDir # shellcheck disable=SC2034 # is passed by name to parseFnArgs - local -ra params=(path name parentDirectory) - parseFnArgs params "$@" + local -ra params=(path name rootDir) + parseFnArgs params "$@" || return $? - local pathAbsolute parentDirectoryAbsolute - pathAbsolute="$(realpath -m "$path")" - parentDirectoryAbsolute="$(realpath -m "$parentDirectory")" - if ! [[ "$pathAbsolute" == "$parentDirectoryAbsolute"* ]]; then - returnDying "the given \033[0;36m%s\033[0m %s is outside of %s" "$name" "$pathAbsolute" "$parentDirectory" || return $? + # shellcheck disable=SC2310 # we are aware of that ! will disable set -e for checkPathIsInsideOf + if ! checkPathIsInsideOf "$path" "$rootDir"; then + returnDying "the given \033[0;36m%s\033[0m %s not inside of %s" "$name" "$pathAbsolute" "$rootDir" || return $? fi } function exitIfPathNamedIsOutsideOf() { - # shellcheck disable=SC2310 # we are aware of that || will disable set -e for checkIfPathNamedIsOutsideOf + # shellcheck disable=SC2310 # we are aware of that || will disable set -e for checkPathNamedIsInsideOf checkPathNamedIsInsideOf "$@" || exit $? } diff --git a/lib/tegonal-scripts/src/utility/git-utils.sh b/lib/tegonal-scripts/src/utility/git-utils.sh index f2d3731..cc2eb93 100644 --- a/lib/tegonal-scripts/src/utility/git-utils.sh +++ b/lib/tegonal-scripts/src/utility/git-utils.sh @@ -5,7 +5,7 @@ # / __/ -_) _ `/ _ \/ _ \/ _ `/ / It is licensed under Apache License 2.0 # \__/\__/\_, /\___/_//_/\_,_/_/ Please report bugs and contribute back your improvements # /___/ -# Version: v4.2.0 +# Version: v4.3.0 # ####### Description ############# # diff --git a/lib/tegonal-scripts/src/utility/gpg-utils.sh b/lib/tegonal-scripts/src/utility/gpg-utils.sh index 5e354b8..477c119 100644 --- a/lib/tegonal-scripts/src/utility/gpg-utils.sh +++ b/lib/tegonal-scripts/src/utility/gpg-utils.sh @@ -6,7 +6,7 @@ # \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0 # /___/ Please report bugs and contribute back your improvements # -# Version: v4.2.0 +# Version: v4.3.0 ####### Description ############# # # utility functions for dealing with gpg diff --git a/lib/tegonal-scripts/src/utility/io.sh b/lib/tegonal-scripts/src/utility/io.sh index 30182c9..fef4c1d 100644 --- a/lib/tegonal-scripts/src/utility/io.sh +++ b/lib/tegonal-scripts/src/utility/io.sh @@ -6,7 +6,7 @@ # \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0 # /___/ Please report bugs and contribute back your improvements # -# Version: v4.2.0 +# Version: v4.3.0 ####### Description ############# # # utility function dealing with Input/Output @@ -63,7 +63,7 @@ function withCustomOutputInput() { withCustomOutputInput_tmpFile=$(mktemp /tmp/tegonal-scripts-io.XXXXXXXXX) eval "exec ${withCustomOutputInput_outputNr}>\"$withCustomOutputInput_tmpFile\"" || traceAndDie "could not create output file descriptor %s" "$withCustomOutputInput_outputNr" eval "exec ${withCustomOutputInput_inputNr}<\"$withCustomOutputInput_tmpFile\"" || traceAndDie "could not create input file descriptor %s" "$withCustomOutputInput_inputNr" - # don't fail if we cannot delete the tmp file, if this should happened, then the system should clean-up the file when the process ends + # don't fail if we cannot delete the tmp file, if this should happen, then the system should clean-up the file when the process ends rm "$withCustomOutputInput_tmpFile" || true $withCustomOutputInput_fun "$@" diff --git a/lib/tegonal-scripts/src/utility/log.sh b/lib/tegonal-scripts/src/utility/log.sh index ef5f06c..85dce68 100644 --- a/lib/tegonal-scripts/src/utility/log.sh +++ b/lib/tegonal-scripts/src/utility/log.sh @@ -7,7 +7,7 @@ # \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0 # /___/ Please report bugs and contribute back your improvements # -# Version: v4.2.0 +# Version: v4.3.0 ####### Description ############# # # Utility functions wrapping printf and prefixing the message with a coloured INFO, WARNING or ERROR. diff --git a/lib/tegonal-scripts/src/utility/parse-args.sh b/lib/tegonal-scripts/src/utility/parse-args.sh index 5858da5..4e4f334 100644 --- a/lib/tegonal-scripts/src/utility/parse-args.sh +++ b/lib/tegonal-scripts/src/utility/parse-args.sh @@ -6,7 +6,7 @@ # \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0 # /___/ Please report bugs and contribute back your improvements # -# Version: v4.2.0 +# Version: v4.3.0 ####### Description ############# # # Intended to parse command line arguments. Provides a simple way to parse named arguments including a documentation diff --git a/lib/tegonal-scripts/src/utility/parse-commands.sh b/lib/tegonal-scripts/src/utility/parse-commands.sh index 642d842..0c1bc8a 100644 --- a/lib/tegonal-scripts/src/utility/parse-commands.sh +++ b/lib/tegonal-scripts/src/utility/parse-commands.sh @@ -6,7 +6,7 @@ # \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0 # /___/ Please report bugs and contribute back your improvements # -# Version: v4.2.0 +# Version: v4.3.0 ####### Description ############# # # Intended to parse command line arguments of a script which uses commands and delegates accordingly. diff --git a/lib/tegonal-scripts/src/utility/parse-fn-args.sh b/lib/tegonal-scripts/src/utility/parse-fn-args.sh index 19e04a3..817ea28 100644 --- a/lib/tegonal-scripts/src/utility/parse-fn-args.sh +++ b/lib/tegonal-scripts/src/utility/parse-fn-args.sh @@ -6,7 +6,7 @@ # \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0 # /___/ Please report bugs and contribute back your improvements # -# Version: v4.2.0 +# Version: v4.3.0 ####### Description ############# # # Intended to parse positional function parameters including assignment and check if there are enough arguments diff --git a/lib/tegonal-scripts/src/utility/parse-utils.sh b/lib/tegonal-scripts/src/utility/parse-utils.sh index 6a18a69..14837c5 100644 --- a/lib/tegonal-scripts/src/utility/parse-utils.sh +++ b/lib/tegonal-scripts/src/utility/parse-utils.sh @@ -6,7 +6,7 @@ # \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0 # /___/ Please report bugs and contribute back your improvements # -# Version: v4.2.0 +# Version: v4.3.0 ####### Description ############# # # Intended to parse command line arguments. Provides a simple way to parse named arguments including a documentation diff --git a/lib/tegonal-scripts/src/utility/recursive-declare-p.sh b/lib/tegonal-scripts/src/utility/recursive-declare-p.sh index 6abb292..739d904 100644 --- a/lib/tegonal-scripts/src/utility/recursive-declare-p.sh +++ b/lib/tegonal-scripts/src/utility/recursive-declare-p.sh @@ -7,7 +7,7 @@ # \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0 # /___/ Please report bugs and contribute back your improvements # -# Version: v4.2.0 +# Version: v4.3.0 ####### Description ############# # # Utility function which returns the `declare` statement of a variable with given name where it recursively calls diff --git a/lib/tegonal-scripts/src/utility/replace-help-snippet.sh b/lib/tegonal-scripts/src/utility/replace-help-snippet.sh index 63ee6cd..a62c6c9 100644 --- a/lib/tegonal-scripts/src/utility/replace-help-snippet.sh +++ b/lib/tegonal-scripts/src/utility/replace-help-snippet.sh @@ -6,7 +6,7 @@ # \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0 # /___/ Please report bugs and contribute back your improvements # -# Version: v4.2.0 +# Version: v4.3.0 ####### Description ############# # # Helper script do capture the `--help` output of a script and replace a snippet in HTML based scripts (e.g. in a Markdown script). @@ -80,7 +80,7 @@ function replaceHelpSnippet() { local snippet cleanedUpSnippet markdownSnippet snippet=$("$script" "${varargs[@]}") || true - # remove ansi colour codes form snippet + # remove ansi colour codes from snippet cleanedUpSnippet=$(perl -0777 -pe "s/\033\[([01];\d{2}|0)m//g" <<<"$snippet") || die "could not quote snippet for %s" "$script" markdownSnippet=$(printf "\`\`\`text\n%s\n\`\`\`" "$cleanedUpSnippet") || die "could not create markdownSnippet for %s" "$script" diff --git a/lib/tegonal-scripts/src/utility/replace-snippet.sh b/lib/tegonal-scripts/src/utility/replace-snippet.sh index 23d700e..11f47bd 100644 --- a/lib/tegonal-scripts/src/utility/replace-snippet.sh +++ b/lib/tegonal-scripts/src/utility/replace-snippet.sh @@ -6,7 +6,7 @@ # \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0 # /___/ Please report bugs and contribute back your improvements # -# Version: v4.2.0 +# Version: v4.3.0 ####### Description ############# # # Helper script do replace a snippet in HTML based files (e.g. in a Markdown file). diff --git a/lib/tegonal-scripts/src/utility/source-once.sh b/lib/tegonal-scripts/src/utility/source-once.sh index f8e41b9..d55f722 100644 --- a/lib/tegonal-scripts/src/utility/source-once.sh +++ b/lib/tegonal-scripts/src/utility/source-once.sh @@ -7,7 +7,7 @@ # \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0 # /___/ Please report bugs and contribute back your improvements # -# Version: v4.2.0 +# Version: v4.3.0 ####### Description ############# # # Utility functions wrapping printf and prefixing the message with a coloured INFO, WARNING or ERROR. diff --git a/lib/tegonal-scripts/src/utility/update-bash-docu.sh b/lib/tegonal-scripts/src/utility/update-bash-docu.sh index e86c3ab..9fe5a3d 100644 --- a/lib/tegonal-scripts/src/utility/update-bash-docu.sh +++ b/lib/tegonal-scripts/src/utility/update-bash-docu.sh @@ -6,7 +6,7 @@ # \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0 # /___/ Please report bugs and contribute back your improvements # -# Version: v4.2.0 +# Version: v4.3.0 # ####### Description ############# #