diff --git a/bin/version-major.sh b/bin/version-major.sh index 00c46d2..0c54f75 100755 --- a/bin/version-major.sh +++ b/bin/version-major.sh @@ -1,11 +1,12 @@ #!/usr/bin/env bash -LAST_VERSION=$(git tag | sort -n | grep "$1" | tail -1) +NAME_PACKAGE=$(basename $1) +LAST_VERSION=$(git tag | sort -n | grep "$NAME_PACKAGE" | tail -1) MAJOR_VERSION=$(echo "$LAST_VERSION" | cut -d@ -f2 | cut -d\. -f1) ((NEW_MAJOR_VERSION=${MAJOR_VERSION:=0}+1)) -NEW_VERSION="$1@${NEW_MAJOR_VERSION}.0.0" +NEW_VERSION="${NAME_PACKAGE}@${NEW_MAJOR_VERSION}.0.0" git tag "${NEW_VERSION}" -m "${NEW_VERSION}" git push --tags echo "Nouvelle version créée: ${NEW_VERSION}" -echo "URL à utiliser: https://gitbucket.inist.fr/tdm/web-services/archive/$1/${NEW_VERSION}.zip" +echo "URL à utiliser: https://gitbucket.inist.fr/tdm/web-services/archive/${NAME_PACKAGE}/${NEW_VERSION}.zip" diff --git a/bin/version-minor.sh b/bin/version-minor.sh index c72ba8b..218b51d 100755 --- a/bin/version-minor.sh +++ b/bin/version-minor.sh @@ -1,12 +1,13 @@ #!/usr/bin/env bash -LAST_VERSION=$(git tag | sort -n | grep "$1" | tail -1) +NAME_PACKAGE=$(basename $1) +LAST_VERSION=$(git tag | sort -n | grep "$NAME_PACKAGE" | tail -1) MAJOR_VERSION=$(echo "$LAST_VERSION" | cut -d@ -f2 | cut -d\. -f1) MINOR_VERSION=$(echo "$LAST_VERSION" | cut -d\. -f2) ((NEW_MINOR_VERSION=${MINOR_VERSION:=-1}+1)) -NEW_VERSION="$1@${MAJOR_VERSION:=0}.${NEW_MINOR_VERSION}.0" +NEW_VERSION="${NAME_PACKAGE}@${MAJOR_VERSION:=0}.${NEW_MINOR_VERSION}.0" git tag "${NEW_VERSION}" -m "${NEW_VERSION}" git push --tags echo "Nouvelle version créée: ${NEW_VERSION}" -echo "URL à utiliser: https://gitbucket.inist.fr/tdm/web-services/archive/$1/${NEW_VERSION}.zip" +echo "URL à utiliser: https://gitbucket.inist.fr/tdm/web-services/archive/${NAME_PACKAGE}/${NEW_VERSION}.zip" diff --git a/bin/version-patch.sh b/bin/version-patch.sh index 42b5422..c3b1faf 100755 --- a/bin/version-patch.sh +++ b/bin/version-patch.sh @@ -1,13 +1,14 @@ #!/usr/bin/env bash -LAST_VERSION=$(git tag | sort -n | grep "$1" | tail -1) +NAME_PACKAGE=$(basename $1) +LAST_VERSION=$(git tag | sort -n | grep "$NAME_PACKAGE" | tail -1) MAJOR_VERSION=$(echo "$LAST_VERSION" | cut -d@ -f2 | cut -d\. -f1) MINOR_VERSION=$(echo "$LAST_VERSION" | cut -d\. -f2) PATCH_VERSION=$(echo "$LAST_VERSION" | cut -d\. -f3) ((NEW_PATCH_VERSION=${PATCH_VERSION:=-1}+1)) -NEW_VERSION="$1@${MAJOR_VERSION:=0}.${MINOR_VERSION:=0}.${NEW_PATCH_VERSION:=0}" +NEW_VERSION="${NAME_PACKAGE}@${MAJOR_VERSION:=0}.${MINOR_VERSION:=0}.${NEW_PATCH_VERSION:=0}" git tag "${NEW_VERSION}" -m "${NEW_VERSION}" git push --tags echo "Nouvelle version créée: ${NEW_VERSION}" -echo "URL à utiliser: https://gitbucket.inist.fr/tdm/web-services/archive/$1/${NEW_VERSION}.zip" +echo "URL à utiliser: https://gitbucket.inist.fr/tdm/web-services/archive/${NAME_PACKAGE}/${NEW_VERSION}.zip"