From 221bed7024e40894c314c9ea65d303cb6fbca4c5 Mon Sep 17 00:00:00 2001 From: Firas al-Khalil Date: Thu, 5 Sep 2024 14:53:16 +0200 Subject: [PATCH] package: simplify versioning Actually, nobody really knows why on earth I was doing that versioning scheme. --- package/deb | 6 ++---- package/zip | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/deb b/package/deb index cfa311e..d6751a3 100755 --- a/package/deb +++ b/package/deb @@ -4,14 +4,12 @@ IFS=$'\n\t' set -vx arch=$(dpkg-architecture -q DEB_BUILD_ARCH) -version_num=$(git describe --tags --abbrev=0 | sed -E 's/v([0-9]+\.[0-9]+)/\1/') -commit_count=$(git rev-list --count --first-parent HEAD) +version=$(git describe --tags --abbrev=0 | sed -E 's/v([0-9]+\.[0-9]+)/\1/') -version="$version_num.$commit_count" echo pkg='tree-sitter-parsers' -pkg_name="$pkg-$version_num-$arch" +pkg_name="$pkg-$version-$arch" rm -rf "$pkg" debian="$pkg/DEBIAN" diff --git a/package/zip b/package/zip index d9549a7..48f2f24 100755 --- a/package/zip +++ b/package/zip @@ -12,10 +12,10 @@ case "$OSTYPE" in ;; esac -version_num=$(git describe --tags --abbrev=0 | sed -E 's/v([0-9]+\.[0-9]+)/\1/') +version=$(git describe --tags --abbrev=0 | sed -E 's/v([0-9]+\.[0-9]+)/\1/') pkg="tree-sitter-parsers" -pkg_name="$pkg-$version_num-$PLATFORM" +pkg_name="$pkg-$version-$PLATFORM" rm -rf "$pkg" dst=$pkg