dev: improve some scripts

This commit is contained in:
Kay Marquardt (Gnadelwartz) 2021-01-03 12:06:39 +01:00
parent fc847c3510
commit c85af776ba
4 changed files with 8 additions and 6 deletions

View File

@ -5,7 +5,7 @@
# #
# Description: run all tests, exit after failed test # Description: run all tests, exit after failed test
# #
#### $$VERSION$$ v1.21-pre-7-g74dfdd7 #### $$VERSION$$ v1.21-pre-45-gfc847c3
############################################################# #############################################################
# magic to ensure that we're always inside the root of our application, # magic to ensure that we're always inside the root of our application,
@ -51,6 +51,7 @@ do
printf "TEST: %s\n" "${test}" printf "TEST: %s\n" "${test}"
"${test}" "${TESTENV}" "${test}" "${TESTENV}"
ret=$? ret=$?
set +e
if [ "$ret" -eq 0 ] ; then if [ "$ret" -eq 0 ] ; then
printf "OK: ---- %s\n" "${test}" printf "OK: ---- %s\n" "${test}"
passed=$((passed+1)) passed=$((passed+1))

View File

@ -3,7 +3,7 @@
# #
# works together with git pre-push.sh and ADD all changed files since last push # works together with git pre-push.sh and ADD all changed files since last push
#### $$VERSION$$ v1.21-pre-3-gbbbf57c #### $$VERSION$$ v1.21-pre-45-gfc847c3
# magic to ensure that we're always inside the root of our application, # magic to ensure that we're always inside the root of our application,
# no matter from which directory we'll run script # no matter from which directory we'll run script
@ -17,7 +17,7 @@ fi
[ ! -f .git/.lastcommit ] && printf "No previous commit or hooks not installed, use \"git add\" instead ... Abort\n" && exit [ ! -f .git/.lastcommit ] && printf "No previous commit or hooks not installed, use \"git add\" instead ... Abort\n" && exit
set +f set +f
FILES="$(find ./* -newer .git/.lastpush| grep -v -e 'DIST\/' -e 'STANDALONE\/' -e 'JSON.sh')" FILES="$(find ./* -newer .git/.lastcommit| grep -v -e 'DIST\/' -e 'STANDALONE\/' -e 'JSON.sh')"
set -f set -f
# FILES="$(find ./* -newer .git/.lastpush)" # FILES="$(find ./* -newer .git/.lastpush)"
[ "${FILES}" = "" ] && printf "Nothing changed since last commit ...\n" && exit [ "${FILES}" = "" ] && printf "Nothing changed since last commit ...\n" && exit

View File

@ -7,7 +7,7 @@
# #
# Options: --notest - skip tests # Options: --notest - skip tests
# #
#### $$VERSION$$ v1.21-pre-7-g74dfdd7 #### $$VERSION$$ v1.21-pre-45-gfc847c3
############################################################## ##############################################################
# magic to ensure that we're always inside the root of our application, # magic to ensure that we're always inside the root of our application,
@ -81,4 +81,5 @@ printf "%s Done!\n" "$0"
# shellcheck disable=SC2086 # shellcheck disable=SC2086
ls -ld ${DISTNAME}-${VERSION}.* ls -ld ${DISTNAME}-${VERSION}.*
# an empty DEBUG.log is created ... :-(
rm -f "$GIT_DIR/../test/"*.log

View File

@ -9,7 +9,7 @@
# If you your bot is finished you can use make-standalone.sh to create the # 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! # the old all-in-one bashbot: bashbot.sh and commands.sh only!
# #
#### $$VERSION$$ v1.21-pre-4-g3193169 #### $$VERSION$$ v1.21-pre-45-gfc847c3
################################################################### ###################################################################
# magic to ensure that we're always inside the root of our application, # magic to ensure that we're always inside the root of our application,