From c85af776ba3fc611035ed73d27c2db7f5a1fe39b Mon Sep 17 00:00:00 2001 From: "Kay Marquardt (Gnadelwartz)" Date: Sun, 3 Jan 2021 12:06:39 +0100 Subject: [PATCH] dev: improve some scripts --- dev/all-tests.sh | 3 ++- dev/git-add.sh | 4 ++-- dev/make-distribution.sh | 5 +++-- dev/make-standalone.sh | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dev/all-tests.sh b/dev/all-tests.sh index 46f219a..fffc964 100755 --- a/dev/all-tests.sh +++ b/dev/all-tests.sh @@ -5,7 +5,7 @@ # # 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, @@ -51,6 +51,7 @@ do printf "TEST: %s\n" "${test}" "${test}" "${TESTENV}" ret=$? + set +e if [ "$ret" -eq 0 ] ; then printf "OK: ---- %s\n" "${test}" passed=$((passed+1)) diff --git a/dev/git-add.sh b/dev/git-add.sh index 5614a90..9a1d608 100755 --- a/dev/git-add.sh +++ b/dev/git-add.sh @@ -3,7 +3,7 @@ # # 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, # 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 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 # FILES="$(find ./* -newer .git/.lastpush)" [ "${FILES}" = "" ] && printf "Nothing changed since last commit ...\n" && exit diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh index b41a37a..6c53f13 100755 --- a/dev/make-distribution.sh +++ b/dev/make-distribution.sh @@ -7,7 +7,7 @@ # # 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, @@ -81,4 +81,5 @@ printf "%s Done!\n" "$0" # shellcheck disable=SC2086 ls -ld ${DISTNAME}-${VERSION}.* - +# an empty DEBUG.log is created ... :-( +rm -f "$GIT_DIR/../test/"*.log diff --git a/dev/make-standalone.sh b/dev/make-standalone.sh index 9bbea10..7d24a0a 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-4-g3193169 +#### $$VERSION$$ v1.21-pre-45-gfc847c3 ################################################################### # magic to ensure that we're always inside the root of our application,