From 7f3aa1f5e7c4774f484005d6b3c4b5875cfd822f Mon Sep 17 00:00:00 2001 From: Joseph Werle Date: Mon, 13 Jun 2022 12:22:33 +0200 Subject: [PATCH] fix(scripts/fix-tag-history): fix tag history rewrite --- scripts/fix-tag-history | 7 ++++++- setup.sh | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/fix-tag-history b/scripts/fix-tag-history index 802ccaa..09666af 100755 --- a/scripts/fix-tag-history +++ b/scripts/fix-tag-history @@ -1,5 +1,10 @@ #!/usr/bin/env bash +pushd . +cd ~ || exit $? +BPKG=$(which bpkg) +popd || exit $? + declare -a tags=($(git tag -l)) #declare -a tags=(1.0.12) @@ -9,7 +14,7 @@ for tag in "${tags[@]}"; do ## checkout `setup.sh` from master branch with latest changes git checkout master -- setup.sh ## get current version - declare version="$(bpkg package version)" + declare version="$("$BPKG" package version | tr -d '[:space:]' | tr -d '"' | sed 's/\[version\]//g')" ## version replacement regex for `sed(1)` declare regex="s/VERSION=.*/VERSION=\"$version\"/g" ## set versions in files diff --git a/setup.sh b/setup.sh index d63781a..eb2f31b 100755 --- a/setup.sh +++ b/setup.sh @@ -9,7 +9,7 @@ # " "" # bash package manager -VERSION="1.0.25" +VERSION="1.1.2" TAG=${TAG:-$VERSION} BRANCH=${BRANCH:-$TAG} REMOTE=${REMOTE:-https://github.com/bpkg/bpkg.git}