From 873169b02933f1b41f6c72c62ef548c4687e1141 Mon Sep 17 00:00:00 2001 From: "Kay Marquardt (Gnadelwartz)" Date: Sat, 19 Dec 2020 14:41:04 +0100 Subject: [PATCH] fix exclude files from everywhere --- dev/make-distribution.sh | 5 +++-- dev/make-standalone.sh | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh index 375b989..8e3dd90 100755 --- a/dev/make-distribution.sh +++ b/dev/make-distribution.sh @@ -2,12 +2,13 @@ # file: make-distribution.sh # creates files and arcchives to dirtribute bashbot # -#### $$VERSION$$ v1.2-dev2-42-g62f2a0d +#### $$VERSION$$ v1.2-dev2-44-gf548b0e # magic to ensure that we're always inside the root of our application, # no matter from which directory we'll run script GIT_DIR=$(git rev-parse --git-dir 2>/dev/null) if [ "$GIT_DIR" != "" ] ; then + [[ "$GIT_DIR" != "/"* ]] && GIT_DIR="${PWD}/${GIT_DIR}" cd "$GIT_DIR/.." || exit 1 else echo "Sorry, no git repository $(pwd)" && exit 1 @@ -64,7 +65,7 @@ source "../../dev/make-html.sh" cd .. || exit 1 echo "Create dist archives" # shellcheck disable=SC2046 -zip -rq - "${DISTNAME}" --exclude $(cat "$GIT_DIR/../dev/${0##*/}.exclude") >"${DISTNAME}-${VERSION}.zip" +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-standalone.sh b/dev/make-standalone.sh index 507ce15..73f5c75 100755 --- a/dev/make-standalone.sh +++ b/dev/make-standalone.sh @@ -5,12 +5,13 @@ # 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.2-0-gc50499c +#### $$VERSION$$ v1.2-dev2-44-gf548b0e # magic to ensure that we're always inside the root of our application, # no matter from which directory we'll run script GIT_DIR=$(git rev-parse --git-dir 2>/dev/null) if [ "$GIT_DIR" != "" ] ; then + [[ "$GIT_DIR" != "/"* ]] && GIT_DIR="${PWD}/${GIT_DIR}" cd "$GIT_DIR/.." || exit 1 else [ ! -f "bashbot.sh" ] && echo "bashbot.sh not found in $(pwd)" && exit 1