From f2d01aa54db864282a2813883937d77aaec0cd68 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Sat, 8 Dec 2018 10:54:47 +0000 Subject: [PATCH] Use bare version in deb/macos packages instead of cut --- contrib/deb/generate.sh | 2 +- contrib/macos/create-pkg.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/deb/generate.sh b/contrib/deb/generate.sh index f99d8348..5af31d5c 100644 --- a/contrib/deb/generate.sh +++ b/contrib/deb/generate.sh @@ -12,7 +12,7 @@ fi PKGBRANCH=$(basename `git name-rev --name-only HEAD`) PKGNAME=$(sh contrib/semver/name.sh) -PKGVERSION=$(sh contrib/semver/version.sh | cut -c 2-) +PKGVERSION=$(sh contrib/semver/version.sh --bare) PKGARCH=${PKGARCH-amd64} PKGFILE=$PKGNAME-$PKGVERSION-$PKGARCH.deb PKGREPLACES=yggdrasil diff --git a/contrib/macos/create-pkg.sh b/contrib/macos/create-pkg.sh index 167184e3..cc9a74f7 100755 --- a/contrib/macos/create-pkg.sh +++ b/contrib/macos/create-pkg.sh @@ -72,7 +72,7 @@ chmod +x pkgbuild/root/usr/local/bin/yggdrasilctl # Work out metadata for the package info PKGNAME=$(sh contrib/semver/name.sh) -PKGVERSION=$(sh contrib/semver/version.sh | cut -c 2-) +PKGVERSION=$(sh contrib/semver/version.sh --bare) PKGARCH=${PKGARCH-amd64} PAYLOADSIZE=$(( $(wc -c pkgbuild/flat/base.pkg/Payload | awk '{ print $1 }') / 1024 ))