Skip to content

Commit 85600fc

Browse files
author
“Sae126V”
committed
Update to improve the naming convention for rpm and deb builds
1 parent 6e83dc3 commit 85600fc

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

scripts/ssm-build.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,13 @@ rm -f "$TAR_FILE"
110110
# Get supplied Python version
111111
PY_VERSION="$(basename "$PYTHON_ROOT_DIR")"
112112
PY_NUM=${PY_VERSION#python}
113+
PY_NUM_FOR_BUILD_NAMING=${PY_NUM/./}
113114
OS_EXTENSION="$(uname -r | grep -o 'el[7-9]' || echo '_all')"
114115

115116
# Universal FPM Call
116117
FPM_CORE="fpm -s python \
117118
-t $PACK_TYPE \
118-
-n apel-ssm \
119+
-n apel-ssm-py${PY_NUM_FOR_BUILD_NAMING} \
119120
-v $VERSION \
120121
--iteration $ITERATION \
121122
-m \"Apel Administrators <[email protected]>\" \
@@ -165,15 +166,15 @@ echo "== Generating pleaserun package =="
165166

166167
# When installed, use pleaserun to perform system specific service setup
167168
fpm -s pleaserun -t "$PACK_TYPE" \
168-
-n apel-ssm-service \
169+
-n apel-ssm-service-py${PY_NUM_FOR_BUILD_NAMING} \
169170
-v "$VERSION" \
170171
--iteration "$ITERATION" \
171172
--"$PACK_TYPE"-dist "$OS_EXTENSION" \
172173
-m "Apel Administrators <[email protected]>" \
173174
--description "Secure Stomp Messenger (SSM) Service Daemon files." \
174175
--architecture all \
175176
--no-auto-depends \
176-
--depends apel-ssm \
177+
--depends apel-ssm-py${PY_NUM_FOR_BUILD_NAMING} \
177178
--depends python3-daemon \
178179
--depends python3-dirq \
179180
--package "$BUILD_DIR" \
@@ -187,8 +188,8 @@ then
187188
TAG="$VERSION-$ITERATION"
188189
DEBDIR="$(dirname "$BUILD_DIR")"
189190

190-
lintian "$DEBDIR"/apel-ssm_"${TAG}"_all.deb
191-
lintian "$DEBDIR"/apel-ssm-service_"${TAG}"_all.deb
191+
lintian "$DEBDIR"/apel-ssm-py"${PY_NUM_FOR_BUILD_NAMING}"_"${TAG}"_all.deb
192+
lintian "$DEBDIR"/apel-ssm-service-py"${PY_NUM_FOR_BUILD_NAMING}"_"${TAG}"_all.deb
192193
else
193194
# Check for errors in SPEC and built packages
194195
# For instance; Given $(dirname /root/rpmb/rpmbuild/source) will output "/root/rpmb/rpmbuild".

0 commit comments

Comments
 (0)