From f43fb72a4c9b1248f40aaecb9e55cdf1b0ca60c0 Mon Sep 17 00:00:00 2001 From: "Kay Marquardt (Gnadelwartz)" Date: Fri, 18 Dec 2020 17:26:05 +0100 Subject: [PATCH] always create fresh zip/tar without unwanted files --- dev/make-distribution.sh | 7 ++++--- dev/make-distribution.sh.exclude | 7 +++++++ 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 dev/make-distribution.sh.exclude diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh index 70da09c..375b989 100755 --- a/dev/make-distribution.sh +++ b/dev/make-distribution.sh @@ -2,7 +2,7 @@ # file: make-distribution.sh # creates files and arcchives to dirtribute bashbot # -#### $$VERSION$$ v1.2-dev2-32-gf762d22 +#### $$VERSION$$ v1.2-dev2-42-g62f2a0d # magic to ensure that we're always inside the root of our application, # no matter from which directory we'll run script @@ -63,8 +63,9 @@ source "../../dev/make-html.sh" # create archive cd .. || exit 1 echo "Create dist archives" -zip -rq "${DISTNAME}-${VERSION}.zip" "${DISTNAME}" -tar -czf "${DISTNAME}-${VERSION}.tar.gz" "${DISTNAME}" +# shellcheck disable=SC2046 +zip -rq - "${DISTNAME}" --exclude $(cat "$GIT_DIR/../dev/${0##*/}.exclude") >"${DISTNAME}-${VERSION}.zip" +tar --exclude-ignore="$GIT_DIR/../dev/${0##*/}.exclude" -czf "${DISTNAME}-${VERSION}.tar.gz" "${DISTNAME}" echo "Done!" diff --git a/dev/make-distribution.sh.exclude b/dev/make-distribution.sh.exclude new file mode 100644 index 0000000..0d04a17 --- /dev/null +++ b/dev/make-distribution.sh.exclude @@ -0,0 +1,7 @@ +data-bot-bash/* +*.jssh +botacl +*.flock +*.log +*.last +*.ok