Skip to content

Commit a327bac

Browse files
tegonal-bottegonal-bot
committed
update files of remote tegonal-scripts to version v4.10.0 via gt
1 parent b657ea3 commit a327bac

37 files changed

Lines changed: 139 additions & 133 deletions

‎.gt/remotes/tegonal-scripts/pulled.tsv‎

Lines changed: 38 additions & 38 deletions
Large diffs are not rendered by default.

‎lib/tegonal-scripts/src/ci/install-shellcheck.sh‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
# \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0
77
# /___/ Please report bugs and contribute back your improvements
88
#
9-
# Version: v4.9.1
9+
# Version: v4.10.0
1010
####### Description #############
1111
#
12-
# installs shellcheck v0.10.0 into $HOME/.local/lib
12+
# installs shellcheck v0.11.0 into $HOME/.local/lib and sets up a symlink in $HOME/.local/bin
1313
#
1414
####### Usage ###################
1515
#
@@ -56,13 +56,13 @@ if command -v curl >/dev/null; then
5656
curl --fail -L -O "$url" || die "could not download shellcheck"
5757
else
5858
# if curl does not exist, then we try it with wget
59-
wget --no-verbose "https://github.com/koalaman/shellcheck/releases/download/$shellcheckVersion/$tarFile"
59+
wget --no-verbose "$url"
6060
fi
6161
sha256sum -c "$tarFile.sha256" || {
6262
actualSha="$(sha256sum "$tarFile")"
6363
die "checksum did not match, aborting\nexpected:\n%s\ngiven :\n%s" "$expectedSha" "$actualSha"
6464
}
65-
tar -xf "./shellcheck-$shellcheckVersion.linux.x86_64.tar.xz"
65+
tar -xf "./$tarFile"
6666
chmod +x "./shellcheck-$shellcheckVersion/shellcheck" || die "could not make shellcheck executable"
6767

6868
shellcheckInTmp="$tmpDir/shellcheck-$shellcheckVersion"
@@ -86,4 +86,12 @@ fi
8686
ln -s "$shellcheckInHomeLocalLib/shellcheck" "$shellcheckBin"
8787

8888
cd "$currentDir"
89-
shellcheck --version
89+
90+
shellcheckPath=$(command -v shellcheck)
91+
if [[ $shellcheckPath != "$shellcheckBin" ]]; then
92+
shellcheckCurrentVersion=$(shellcheck --version)
93+
logError "was able to install shellcheck in %s but \`command -v shellcheck\` returns another path:\n%s\nFollowing the output of \`shellcheck --version\`:\n%s" "$shellcheckBin" "$shellcheckPath" "$shellcheckCurrentVersion"
94+
else
95+
shellcheck --version
96+
printf "\033[0;32mSUCCESS\033[0m: installed shellcheck %s in %s\n" "$shellcheckVersion" "$homeLocalLib"
97+
fi

‎lib/tegonal-scripts/src/qa/run-shellcheck.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0
77
# /___/ Please report bugs and contribute back your improvements
88
#
9-
# Version: v4.9.1
9+
# Version: v4.10.0
1010
####### Description #############
1111
#
1212
# function which searches for *.sh files within defined paths (directories or a single *.sh) and
@@ -53,8 +53,8 @@ function runShellcheck() {
5353
exitIfCommandDoesNotExist "shellcheck" "execute $dir_of_tegonal_scripts/ci/install-shellcheck.sh (if pulled) or see https://github.com/koalaman/shellcheck#installing"
5454

5555
if (($# < 2)); then
56-
logError "At least two parameters need to be passed to runShellcheck, given \033[0;36m%s\033[0m\nFollowing a description of the parameters:" "$#"
57-
echo >&2 '1: dirs name of array which contains paths in which *.sh files are searched'
56+
logError "At least two arguments need to be passed to runShellcheck, given \033[0;36m%s\033[0m\nFollowing a description of the parameters:" "$#"
57+
echo >&2 '1: paths name of array which contains paths in which *.sh files are searched'
5858
echo >&2 "2: sourcePath equivalent to shellcheck's -P, path to search for sourced files, separated by :"
5959
echo >&2 '3... args additional args which are passed to the find command'
6060
printStackTrace

‎lib/tegonal-scripts/src/releasing/common-constants.source.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under European Union Public License 1.2
88
# /___/ Please report bugs and contribute back your improvements
99
#
10-
# Version: v4.9.1
10+
# Version: v4.10.0
1111
####### Description #############
1212
#
1313
# constants intended to be sourced into a function

‎lib/tegonal-scripts/src/releasing/deduce-next-version.source.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0
88
# /___/ Please report bugs and contribute back your improvements
99
#
10-
# Version: v4.9.1
10+
# Version: v4.10.0
1111
####### Description #############
1212
#
1313
# intended to be sourced into a function which expects params version and nextVersion

‎lib/tegonal-scripts/src/releasing/pre-release-checks-git.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0
77
# /___/ Please report bugs and contribute back your improvements
88
#
9-
# Version: v4.9.1
9+
# Version: v4.10.0
1010
####### Description #############
1111
#
1212
# Checks that releasing a certain version (creating a corresponding git tag) makes sense: We check:
@@ -34,7 +34,7 @@
3434
set -euo pipefail
3535
shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; }
3636
unset CDPATH
37-
export TEGONAL_SCRIPTS_VERSION='v4.9.1'
37+
export TEGONAL_SCRIPTS_VERSION='v4.10.0'
3838

3939
if ! [[ -v dir_of_tegonal_scripts ]]; then
4040
dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.."
@@ -64,7 +64,7 @@ function preReleaseCheckGit() {
6464

6565
local tags
6666
tags=$(git tag) || die "The following command failed (see above): git tag"
67-
if grep -q --fixed-strings "$version" <<< "$tags"; then
67+
if grep -q --fixed-strings "$version" <<<"$tags"; then
6868
logError "tag %s already exists locally, adjust version or delete it with git tag -d %s" "$version" "$version"
6969
if hasRemoteTag "$version"; then
7070
printf >&2 "Note, it also exists on the remote which means you also need to delete it there -- e.g. via git push origin :%s\n" "$version"

‎lib/tegonal-scripts/src/releasing/prepare-files-next-dev-cycle.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0
77
# /___/ Please report bugs and contribute back your improvements
88
#
9-
# Version: v4.9.1
9+
# Version: v4.10.0
1010
####### Description #############
1111
#
1212
# Prepare the next dev cycle for files based on conventions:
@@ -28,7 +28,7 @@
2828
# # prepare dev cycle for version v0.2.0, assumes a function beforePr is in scope which we sourced above
2929
# "$dir_of_tegonal_scripts/releasing/prepare-files-next-dev-cycle.sh" -v v0.2.0
3030
#
31-
# function specialBeforePr(){
31+
# function specialBeforePr() {
3232
# beforePr && echo "imagine some additional work"
3333
# }
3434
# # make the function visible to release-files.sh / not necessary if you source prepare-files-next-dev-cycle.sh, see further below
@@ -60,7 +60,7 @@
6060
set -euo pipefail
6161
shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; }
6262
unset CDPATH
63-
export TEGONAL_SCRIPTS_VERSION='v4.9.1'
63+
export TEGONAL_SCRIPTS_VERSION='v4.10.0'
6464

6565
if ! [[ -v dir_of_tegonal_scripts ]]; then
6666
dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.."

‎lib/tegonal-scripts/src/releasing/prepare-next-dev-cycle-template.sh‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0
77
# /___/ Please report bugs and contribute back your improvements
88
#
9-
# Version: v4.9.1
9+
# Version: v4.10.0
1010
####### Description #############
1111
#
1212
# Prepares the next dev cycle based on conventions:
@@ -28,40 +28,39 @@
2828
# dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/../lib/tegonal-scripts/src"
2929
# source "$dir_of_tegonal_scripts/setup.sh" "$dir_of_tegonal_scripts"
3030
#
31-
#
3231
# function prepareNextAfterVersionUpdateHook() {
3332
# # some additional version bumps e.g. using perl
3433
# perl -0777 -i #...
3534
# }
36-
# # make the function visible to release-templates.sh / not necessary if you source release-templates.sh, see further below
37-
# declare -fx releaseScalaLib
35+
# # make the function visible to prepare-next-dev-cycle-templates.sh / not necessary if you source it, see further below
36+
# declare -fx prepareNextAfterVersionUpdateHook
3837
#
39-
# # releases version v0.1.0 using releaseScalaLib as hook
40-
# "$dir_of_tegonal_scripts/releasing/release-template.sh" \
41-
# -v v0.1.0 -k "0x945FE615904E5C85" --release-hook releaseScalaLib
38+
# # prepare version 0.1.0 dev cycle
39+
# "$dir_of_tegonal_scripts/releasing/prepare-next-dev-cycle-templates.sh" \
40+
# -v v0.1.0 -k "0x945FE615904E5C85" --after-version-update-hook prepareNextAfterVersionUpdateHook
4241
#
43-
# # releases version v0.1.0 using releaseScalaLib as hook and
42+
# # prepare version 0.1.0 dev cycle
4443
# # searches for additional occurrences where the version should be replaced via the specified pattern in:
4544
# # - script files in ./src and ./scripts
4645
# # - ./README.md
4746
# "$dir_of_tegonal_scripts/releasing/release-files.sh" \
48-
# -v v0.1.0 -k "0x945FE615904E5C85" --release-hook releaseScalaLib \
47+
# -v v0.1.0 -k "0x945FE615904E5C85" --after-version-update-hook prepareNextAfterVersionUpdateHook \
4948
# -p "(TEGONAL_SCRIPTS_VERSION=['\"])[^'\"]+(['\"])"
5049
#
51-
# # in case you want to provide your own release.sh and only want to do some pre-configuration
52-
# # (such as specify the release-hook) then you might want to source it instead
53-
# sourceOnce "$dir_of_tegonal_scripts/releasing/release-template.sh"
50+
# # in case you want to provide your own prepare-next-dev-cycle.sh and only want to do some pre-configuration
51+
# # (such as specify the after-version-hook) then you might want to source it instead
52+
# sourceOnce "$dir_of_tegonal_scripts/releasing/prepare-next-dev-cycle-templates.sh.sh"
5453
#
5554
# # and then call the function with your pre-configuration settings:
56-
# # here we define the function which shall be used as release-hook after "$@" this way one cannot override it.
57-
# # put --release-hook before "$@" if you want to define only a default
58-
# releaseTemplates "$@" --release-hook releaseScalaLib
55+
# # here we define the function which shall be used as after-version-update-hook after "$@", this way one cannot
56+
# # override it. put --after-version-update-hook before "$@" if you want to define only a default
57+
# prepareNextDevCycleTemplate "$@" --after-version-update-hook prepareNextAfterVersionUpdateHook
5958
#
6059
###################################
6160
set -euo pipefail
6261
shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; }
6362
unset CDPATH
64-
export TEGONAL_SCRIPTS_VERSION='v4.9.1'
63+
export TEGONAL_SCRIPTS_VERSION='v4.10.0'
6564

6665
if ! [[ -v dir_of_tegonal_scripts ]]; then
6766
dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.."

‎lib/tegonal-scripts/src/releasing/release-files.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0
77
# /___/ Please report bugs and contribute back your improvements
88
#
9-
# Version: v4.9.1
9+
# Version: v4.10.0
1010
####### Description #############
1111
#
1212
# Releasing files based on conventions:
@@ -75,7 +75,7 @@
7575
set -euo pipefail
7676
shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; }
7777
unset CDPATH
78-
export TEGONAL_SCRIPTS_VERSION='v4.9.1'
78+
export TEGONAL_SCRIPTS_VERSION='v4.10.0'
7979

8080
if ! [[ -v dir_of_tegonal_scripts ]]; then
8181
dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.."

‎lib/tegonal-scripts/src/releasing/release-template.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# \__/\__/\_, /\___/_//_/\_,_/_/ It is licensed under Apache License 2.0
77
# /___/ Please report bugs and contribute back your improvements
88
#
9-
# Version: v4.9.1
9+
# Version: v4.10.0
1010
####### Description #############
1111
#
1212
# Defines a release process template where some conventions are defined:
@@ -60,7 +60,7 @@
6060
# sourceOnce "$dir_of_tegonal_scripts/releasing/release-template.sh"
6161
#
6262
# # and then call the function with your pre-configuration settings:
63-
# # here we define the function which shall be used as release-hook after "$@" this way one cannot override it.
63+
# # here we define the function which shall be used as release-hook after "$@", this way one cannot override it.
6464
# # put --release-hook before "$@" if you want to define only a default
6565
# releaseTemplates "$@" --release-hook releaseScalaLib
6666
#
@@ -80,7 +80,7 @@
8080
set -euo pipefail
8181
shopt -s inherit_errexit || { echo >&2 "please update to bash 5, see errors above" && exit 1; }
8282
unset CDPATH
83-
export TEGONAL_SCRIPTS_VERSION='v4.9.1'
83+
export TEGONAL_SCRIPTS_VERSION='v4.10.0'
8484

8585
if ! [[ -v dir_of_tegonal_scripts ]]; then
8686
dir_of_tegonal_scripts="$(cd -- "$(dirname -- "${BASH_SOURCE[0]:-$0}")" >/dev/null && pwd 2>/dev/null)/.."

0 commit comments

Comments
 (0)