diff --git a/dev/hooks/post-commit.sh b/dev/hooks/post-commit.sh index f859dc2..227d06d 100755 --- a/dev/hooks/post-commit.sh +++ b/dev/hooks/post-commit.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v1.20-0-g2ab00a2 +#### $$VERSION$$ v1.21-pre-4-g3193169 ############ # NOTE: you MUST run install-hooks.sh again when updating this file! @@ -15,8 +15,7 @@ LASTPUSH='.git/.lastcommit' # if any command inside script returns error, exit and return that error set -e -#echo "Running post-commit hook" -#echo "............................" +#printf "Running post-commit hook\n............................\n" unset IFS; set -f diff --git a/dev/hooks/pre-commit.sh b/dev/hooks/pre-commit.sh index 81d2c0d..e098eab 100755 --- a/dev/hooks/pre-commit.sh +++ b/dev/hooks/pre-commit.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v1.21-dev-10-g9bfc27a +#### $$VERSION$$ v1.21-pre-4-g3193169 ############ # NOTE: you MUST run install-hooks.sh again when updating this file! @@ -15,16 +15,15 @@ LASTPUSH='.git/.lastpush' # if any command inside script returns error, exit and return that error set -e -echo "Running pre-commit hook" -echo "............................" +printf "Running pre-commit hook\n............................\n" unset IFS; set -f # check for shellcheck if command -v shellcheck >/dev/null 2>&1; then - echo "Test all scripts with shellcheck" + printf "Test all scripts with shellcheck\n" else - echo "Error: shellcheck is not installed. Please install shellcheck" + printf "Error: shellcheck is not installed. Please install shellcheck\n" exit 1 fi @@ -36,8 +35,7 @@ FILES="${FILES} $(sed '/^#/d' <"dev/shellcheck.files")" if [ "$FILES" != "" ]; then # shellcheck disable=SC2086 shellcheck -x ${FILES} || exit 1 - echo " OK" - echo "............................" + printf " OK\n............................\n" else # something went wrong exit 1 @@ -48,31 +46,28 @@ VERSION="$(git describe --tags | sed -e 's/-.*//' -e 's/v//' -e 's/,/./')" # LOCAL version must greater than latest REMOTE release version -echo "Update Version of modified files" -if ! command -v bc &> /dev/null || (( $(echo "${VERSION} >= ${REMOTEVER}" | bc -l) )); then +printf "Update Version of modified files\n" +if ! command -v bc &> /dev/null || (( $(printf "%s\n" "${VERSION} >= ${REMOTEVER}" | bc -l) )); then # update version in bashbot files on push set +f [ -f "${LASTPUSH}" ] && LASTFILES="$(find ./* -newer "${LASTPUSH}")" [ "${LASTFILES}" = "" ] && exit - echo -n " " + printf " " # shellcheck disable=SC2086 dev/version.sh ${LASTFILES} 2>/dev/null || exit 1 - echo " OK" - echo "............................" + printf " OK\n............................\n" else - echo "Error: local version ${VERSION} must be equal to or greater then release version ${REMOTEVER}." - echo "use \"git tag vx.zz\" to create a new local version" + printf "Error: local version %s must be equal to or greater then release version%s\n" "${VERSION}" "${REMOTEVER}." + printf "use \"git tag vx.zz\" to create a new local version\n" exit 1 fi if command -v codespell &>/dev/null; then - echo "Running codespell" - echo "............................" + printf "Running codespell\n............................\n" codespell -q 3 --skip="*.zip,*gz,*.log,*.html,*.txt,.git*,jsonDB-keyboard" -L "ba" - echo "if there are (to many) typo's shown, consider running:" - echo "codespell -i 3 -w --skip=\"*.log,*.html,*.txt,.git*,examples\" -L \"ba\"" + printf "if there are (to many) typo's shown, consider running:\ncodespell -i 3 -w --skip=\"*.log,*.html,*.txt,.git*,examples\" -L \"ba\"\n" else - echo "consider installing codespell: pip install codespell" + printf "consider installing codespell: pip install codespell\n" fi -echo "............................" +printf "............................\n" diff --git a/dev/hooks/pre-push.sh b/dev/hooks/pre-push.sh index 07df1ca..96f6687 100755 --- a/dev/hooks/pre-push.sh +++ b/dev/hooks/pre-push.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v1.20-0-g2ab00a2 +#### $$VERSION$$ v1.21-pre-4-g3193169 ############ # NOTE: you MUST run install-hooks.sh again when updating this file! @@ -15,8 +15,7 @@ LASTPUSH='.git/.lastpush' # if any command inside script returns error, exit and return that error set -e -echo "Running pre-push hook" -echo "............................" +printf "Running pre-push hook\n............................\n" unset IFS; set -f diff --git a/dev/make-standalone.sh b/dev/make-standalone.sh index 49691fb..9bbea10 100755 --- a/dev/make-standalone.sh +++ b/dev/make-standalone.sh @@ -9,7 +9,7 @@ # If you your bot is finished you can use make-standalone.sh to create the # the old all-in-one bashbot: bashbot.sh and commands.sh only! # -#### $$VERSION$$ v1.21-pre-3-gbbbf57c +#### $$VERSION$$ v1.21-pre-4-g3193169 ################################################################### # magic to ensure that we're always inside the root of our application, @@ -43,7 +43,7 @@ source "$GIT_DIR/../dev/inject-json.sh" # here the magic starts # create all in one bashbot.sh file -printf "OK, now lets do the magic ...\n... create unified commands.sh\n" +printf "OK, now lets do the magic ...\n\t... create unified commands.sh\n" { # first head of commands.sh @@ -62,7 +62,7 @@ printf "OK, now lets do the magic ...\n... create unified commands.sh\n" mv $$commands.sh commands.sh rm -f mycommands.sh -printf " ... create unified bashbot.sh\n" +printf "\n... create unified bashbot.sh\n" { # first head of bashbot.sh