Skip to content

Commit 9e73ef5

Browse files
committed
return with error if parsing (fn) args fails
1 parent dc8fbea commit 9e73ef5

38 files changed

+84
-260
lines changed

.gt/lib/tegonal-gh-commons/src/gt/pull-hook-functions.sh

Lines changed: 0 additions & 164 deletions
This file was deleted.

.gt/lib/tegonal-gh-commons/src/gt/tegonal.data.source.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

.gt/remotes/tegonal-gh-commons/pull-hook.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function gt_pullHook_tegonal_gh_commons_before() {
3030
local _tag source _target
3131
# shellcheck disable=SC2034 # is passed to parseFnArgs by name
3232
local -ra params=(_tag source _target)
33-
parseFnArgs params "$@"
33+
parseFnArgs params "$@" || return $?
3434

3535
replaceTegonalGhCommonsPlaceholders_Tegonal "$source" "tegonal-scripts" "$TEGONAL_SCRIPTS_LATEST_VERSION" "scripts"
3636
}
@@ -39,7 +39,7 @@ function gt_pullHook_tegonal_gh_commons_after() {
3939
local _tag source target
4040
# shellcheck disable=SC2034 # is passed to parseFnArgs by name
4141
local -ra params=(_tag source target)
42-
parseFnArgs params "$@"
42+
parseFnArgs params "$@" || return $?
4343

4444
if [[ $source =~ .*/src/gt/signing-key.public.asc.actual_sig ]]; then
4545
mv "$target" "$(dirname "$target")/signing-key.public.asc.sig"

.gt/remotes/tegonal-gh-commons/pulled.tsv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ v2.8.2 src/.github/workflows/cleanup.yml ../.github/workflows/cleanup.yml .* 705
44
v2.8.2 src/.github/dependabot.yml ../.github/dependabot.yml .* 9f631eac687bd929d16f1ac3569fe8ef48ed9263fa2fee11265c4fc27d3b5a9fab1a5c4d63438ccd394fe33ae09003dac4af0094c3ff4fd84f7d8b0aeaa4fbcf
55
v2.8.2 src/.github/CODE_OF_CONDUCT.md ../.github/CODE_OF_CONDUCT.md .* 5dc73021b3972b3200c12fb2754e335321d07c5f7372977368b9964252501b665ddd12bf267939d4a34dc7ee8d3040cef8f4abaf0aed6dd2ce23c865e0300383
66
v2.8.2 src/.github/PULL_REQUEST_TEMPLATE.md ../.github/PULL_REQUEST_TEMPLATE.md .* 9112d1ea1f72ea250cdfe686fc152e63f2e0cdcea9c46935289471d7a3f54c35af8a3f283570f5d863e936c7782939c7b1548cb7d4ccda712bbf9314926f58cb
7-
v2.8.2 src/gt/pull-hook-functions.sh lib/tegonal-gh-commons/src/gt/pull-hook-functions.sh .* 6190f8d9f1fa9295fc562b0a34d73fec0792753020ed2a19c9b8a3e855a2c453d642763e831eb47aeb20cdbb78ef2aeb7f8d11bf03aae6784843072f05433596
7+
v2.8.2 src/gt/pull-hook-functions.sh ../lib/tegonal-gh-commons/src/gt/pull-hook-functions.sh .* 6190f8d9f1fa9295fc562b0a34d73fec0792753020ed2a19c9b8a3e855a2c453d642763e831eb47aeb20cdbb78ef2aeb7f8d11bf03aae6784843072f05433596
88
v2.8.2 src/.github/Contributor Agreement.txt ../.github/Contributor Agreement.txt .* 0b9a8a954edf302ca5fe0062b7e283d3da06a6bc0631a812663095a78b3a734cefb43b725ae342694d770be75206124c42a1150e168fac33f28aebea0bda35ec
99
v2.8.2 src/gt/signing-key.public.asc signing-key.public.asc .* 36edec73464b610713fe8ba32b7c8c26d378d74d590883ba00ca3175efc4f1b753b60ae6aa03ddd1038642899c1394861e02038853734a43d4bf845762b91708
1010
v2.8.2 src/gt/signing-key.public.asc.actual_sig signing-key.public.asc.actual_sig .* 50eacd712448066974382e7e05ac4fe42e9026dafd0d963c763b7e402d31a9ceb1d012897b2bc7e69d37d670148d57647d563870e5ca2832d8cdde91c92f55db
1111
v2.8.2 src/dotfiles/.editorconfig ../.editorconfig .* ab20f56af1aa48e8be29e3b43fba449b1401d17ca5aab0b7b4f0ce65621ede33ff3c68144d350cb3a820c4a573218d0af5ecab9458c19701427f9d1c5d15211c
1212
v2.8.2 src/dotfiles/.shellcheckrc ../.shellcheckrc .* 2284b5a0f7d94916bf881b4e1f1ba3cbeb92ad51442b56dd6049bbcf9f4d7da4de3e82c1ae75a70e281cb2fbf390eb7676cbe553a630a1a58cd7895cfd2be2f6
13-
v2.8.2 src/gt/tegonal.data.source.sh lib/tegonal-gh-commons/src/gt/tegonal.data.source.sh .* 2c6600541c12c35c9a7a202cec91de5b2f01d4a3cb067fa57fb0c21ebb15be2cbe191967fa209bd69a8100c77e6e6df08031824ff43e6d0f81a95476ce6619c8
13+
v2.8.2 src/gt/tegonal.data.source.sh ../lib/tegonal-gh-commons/src/gt/tegonal.data.source.sh .* 2c6600541c12c35c9a7a202cec91de5b2f01d4a3cb067fa57fb0c21ebb15be2cbe191967fa209bd69a8100c77e6e6df08031824ff43e6d0f81a95476ce6619c8

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1815,7 +1815,7 @@ function myFunction() {
18151815

18161816
# shellcheck disable=SC2034 # is passed by name to parseFnArgs
18171817
local -ra params=(command dir)
1818-
parseFnArgs params "$@"
1818+
parseFnArgs params "$@" || return $?
18191819

18201820
# pass your variables storing the arguments to other scripts
18211821
echo "command: $command, dir: $dir"
@@ -1827,7 +1827,7 @@ function myFunctionWithVarargs() {
18271827
local command dir varargs
18281828
# shellcheck disable=SC2034 # is passed by name to parseFnArgs
18291829
local -ra params=(command dir varargs)
1830-
parseFnArgs params "$@"
1830+
parseFnArgs params "$@" || return $?
18311831

18321832
# use varargs in another script
18331833
echo "command: $command, dir: $dir, varargs: ${varargs*}"

scripts/prepare-next-dev-cycle.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function prepareNextDevCycle() {
4242
additionalPattern "$additionalPatternParamPattern" "is ignored as additional pattern is specified internally, still here as release-files uses this argument"
4343
beforePrFn "$beforePrFnParamPattern" "$beforePrFnParamDocu"
4444
)
45-
parseArguments params "" "$TEGONAL_SCRIPTS_VERSION" "$@"
45+
parseArguments params "" "$TEGONAL_SCRIPTS_VERSION" "$@" || return $?
4646
# we don't check if all args are set (and neither set default values) as we currently don't use
4747
# any param in here but just delegate to prepareFilesNextDevCycle.
4848

scripts/release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ function release() {
5656
nextVersion "$nextVersionParamPattern" "$nextVersionParamDocu"
5757
prepareOnly "$prepareOnlyParamPattern" "$prepareOnlyParamDocu"
5858
)
59-
parseArguments params "" "$TEGONAL_SCRIPTS_VERSION" "$@"
59+
parseArguments params "" "$TEGONAL_SCRIPTS_VERSION" "$@" || return $?
6060
# we don't check if all args are set (and neither set default values) as we currently don't use
6161
# any param in here but just delegate to releaseFiles.
6262

@@ -66,7 +66,7 @@ function release() {
6666

6767
function release_afterVersionHook() {
6868
local version projectsRootDir additionalPattern
69-
parseArguments afterVersionHookParams "" "$TEGONAL_SCRIPTS_VERSION" "$@"
69+
parseArguments afterVersionHookParams "" "$TEGONAL_SCRIPTS_VERSION" "$@" || return $?
7070

7171
# same as in pull-hook.sh
7272
local -r githubUrl="https://github.com/tegonal/scripts"

src/ci/jelastic/deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ function jelastic_deploy() {
5959
nodeGroup '-n|--nodeGroup' 'The nodeGroup to use'
6060
tag '-t|--tag' 'The tag which shall be deployed'
6161
)
62-
parseArguments params "" "$TEGONAL_SCRIPTS_VERSION" "$@"
62+
parseArguments params "" "$TEGONAL_SCRIPTS_VERSION" "$@" || return $?
6363
exitIfNotAllArgumentsSet params "" "$TEGONAL_SCRIPTS_VERSION"
6464

6565
jelastic_signin "$url" "$login" "$password" || die "could not login to jelastic instance"

src/ci/jelastic/utils.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ function jelastic_signin() {
7272
# params is required for parseFnArgs thus:
7373
# shellcheck disable=SC2034
7474
local -ra params=(url login password)
75-
parseFnArgs params "$@"
75+
parseFnArgs params "$@" || return $?
7676

7777
echo "Signing in..."
7878
jelastic_exec "users/authentication/signin" --login "$login" --password "$password" --platformUrl "$url" >/dev/null

src/releasing/pre-release-checks-git.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ function preReleaseCheckGit() {
5555
branch "$branchParamPattern" "$branchParamDocu"
5656
)
5757

58-
parseArguments params "" "$TEGONAL_SCRIPTS_VERSION" "$@"
58+
parseArguments params "" "$TEGONAL_SCRIPTS_VERSION" "$@" || return $?
5959
if ! [[ -v branch ]]; then branch="main"; fi
6060
exitIfNotAllArgumentsSet params "" "$TEGONAL_SCRIPTS_VERSION"
6161
exitIfArgIsNotVersion "$version" "$versionParamPatternLong"

0 commit comments

Comments
 (0)