Skip to content

Commit 1730e07

Browse files
committed
get package tag version from binary instead
1 parent ee39475 commit 1730e07

1 file changed

Lines changed: 3 additions & 20 deletions

File tree

build-packages.sh

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,25 +31,8 @@ if [ ! -f "dist/$bin" ]; then
3131
exit 1
3232
fi
3333

34-
if [ -z "${FRANKENPHP_VERSION}" ]; then
35-
FRANKENPHP_VERSION="$(git rev-parse --verify HEAD)"
36-
export FRANKENPHP_VERSION
37-
elif [ -d ".git/" ]; then
38-
CURRENT_REF="$(git rev-parse --abbrev-ref HEAD)"
39-
export CURRENT_REF
40-
41-
if echo "${FRANKENPHP_VERSION}" | grep -F -q "."; then
42-
# Tag
43-
44-
# Trim "v" prefix if any
45-
FRANKENPHP_VERSION=${FRANKENPHP_VERSION#v}
46-
export FRANKENPHP_VERSION
47-
48-
git checkout "v${FRANKENPHP_VERSION}"
49-
else
50-
git checkout "${FRANKENPHP_VERSION}"
51-
fi
52-
fi
34+
version_output="$(dist/"$bin" version)"
35+
FRANKENPHP_VERSION=$(echo "$version_output" | grep -oP 'FrankenPHP\s+\K[0-9]+\.[0-9]+\.[0-9]+' || true)
5336

5437
if [[ ! "${FRANKENPHP_VERSION}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
5538
echo "Warning: FRANKENPHP_VERSION must be set to X.Y.Z (e.g. 1.5.1), got '${FRANKENPHP_VERSION}'"
@@ -130,6 +113,6 @@ fpm -s dir -t deb -n frankenphp -v "${FRANKENPHP_VERSION}" \
130113
"../package/empty/=/var/lib/frankenphp"
131114

132115
[ "$user_preexists" -eq 0 ] && sudo userdel frankenphp
133-
[ "$group_preexists" -eq 0 ] && (sudo groupdel frankenphp || true)
116+
[ "$group_preexists" -eq 0 ] && sudo groupdel frankenphp
134117

135118
cd ..

0 commit comments

Comments
 (0)