Compare commits

..

No commits in common. "79cdf25efde5fbf63062cab2da7c09b5d42c2d09" and "bf3bf6aa243cdf8f42901964e75ec6d65f3260cf" have entirely different histories.

View file

@ -2,56 +2,55 @@
set -e set -e
test -f cosmos.conf && . ./cosmos.conf
echo "Fetching any updates from server:" echo "Fetching any updates from server:"
git pull git pull
echo "" echo ""
if [[ -z ${1} ]]; then if [ "x$1" = "x" ]; then
deftag=$(basename "${PWD}") deftag=`basename $PWD`
else else
deftag="${1}" deftag="$1"
fi fi
tagpfx=${tag:="${deftag}"} tagpfx=${tag:="$deftag"}
last_tag=$(git tag -l "${tagpfx}-*" | sort | tail -1) last_tag=`git tag -l "${tagpfx}-*"|sort|tail -1`
echo "Verifying last tag ${last_tag}:" echo "Verifying last tag $last_tag:"
(git tag -v "${last_tag}" | grep ^gpg:) || true (git tag -v $last_tag | grep ^gpg:) || true
# again to not mask exit status of git with grep # again to not mask exit status of git with grep
git tag -v "${last_tag}" >/dev/null 2>&1 git tag -v $last_tag > /dev/null 2>&1
echo "" echo ""
echo "Differences between tag ${last_tag} and what you are about to sign:" echo "Differences between tag $last_tag and what you are about to sign:"
env PAGER=cat git diff --color "${last_tag}..main" PAGER=cat git diff --color $last_tag..main
iter=1 iter=1
ok= ok=
while test -z "$ok"; do while test -z "$ok"; do
this_tag=$(date "+${tagpfx}-%Y-%m-%d-v$(printf "%02d" ${iter})") this_tag=$(date +${tagpfx}-%Y-%m-%d-v`printf "%02d" $iter`)
iter=$(( iter + 1)) iter=`expr $iter + 1`
case $( ( case `(echo $this_tag; echo $last_tag) | sort | tail -1` in
echo "${this_tag}" $last_tag)
echo "${last_tag}" ;;
) | sort | tail -1) in $this_tag)
"${last_tag}") ;;
"${this_tag}")
ok=yes ok=yes
;; ;;
esac esac
done done
if [ "${deftag}" != "${tagpfx}" ]; then if [ "$deftag" != "$tagpfx" ]; then
echo -e "Using new tag \e[94m${this_tag}\e[0m according to pattern in cosmos.conf" echo -e "Using new tag \e[94m$this_tag\e[0m according to pattern in cosmos.conf"
else else
echo -e "Using new tag \e[94m${this_tag}\e[0m" echo -e "Using new tag \e[94m$this_tag\e[0m"
fi fi
echo -e "\e[1mONLY SIGN IF YOU APPROVE OF VERIFICATION AND DIFF ABOVE\e[0m" echo -e "\e[1mONLY SIGN IF YOU APPROVE OF VERIFICATION AND DIFF ABOVE\e[0m"
# GITTAGEXTRA is for putting things like "-u 2117364A" # GITTAGEXTRA is for putting things like "-u 2117364A"
# shellcheck disable=SC2086
git tag ${GITTAGEXTRA} -s "${this_tag}" -m bump. git tag $GITTAGEXTRA -m bump. -s $this_tag
git push git push
git push --tags git push --tags