Skip to content

Commit 268c560

Browse files
committed
fix paths for FreeBSD pkgs when version 2.x
1 parent 5a36dc2 commit 268c560

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

scripts/packages/package-check.sh

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ uris=(
116116
${SUSE[@]}
117117
)
118118

119-
if [[ ${majorVersion} == 2 ]]; then
119+
if [[ ${majorVersion} == "2" ]]; then
120120
# v2.x supports FreeBSD packages
121121
FREEBSD=(
122122
freebsd/FreeBSD:12:amd64/latest/nginx-agent-$VERSION.pkg
@@ -240,20 +240,28 @@ prep_txz() {
240240
bsd=$(echo "$i" | grep -e "FreeBSD:[0-9]*")
241241
ver=$(echo "$bsd" | cut -d':' -f2)
242242
arch=$(echo "$i" | grep -o -F -e "amd64" -e "arm64")
243-
dest="$(dirname "$i")/nginx-agent-${VERSION}-FreeBSD.$ver.$arch.pkg"
243+
244+
# Azure path
245+
# Should be 'FreeBSD:12:amd64/nginx-agent-2.44.0.pkg'
244246
az_dest="${PKG_DIR}/azure/txz/FreeBSD:$ver:$arch/nginx-agent-${VERSION}.pkg"
245-
echo "Copying ${i} to ${az_dest/latest\//}"
247+
echo "Copying ${i} to ${az_dest}"
246248
mkdir -p "$(dirname "$az_dest")"
247249
cp "${i}" "${az_dest}"
250+
251+
# GitHub release asset path
252+
# Should be 'nginx-agent-2.44.0-FreeBSD.12.amd64.pkg'
253+
dest="$(dirname "$i")/nginx-agent-${VERSION}-FreeBSD.$ver.$arch.pkg"
254+
echo "Moving ${i} to ${dest}"
255+
cp "${i}" "${dest}"
248256
done
249257
}
250258

251259
prepare_packages() {
252260
echo "Preparing packages for upload..."
253-
prep_deb
254-
prep_apk
255-
prep_rpm
256-
if [[ ${majorVersion} == 2 ]]; then
261+
# prep_deb
262+
# prep_apk
263+
# prep_rpm
264+
if [[ ${majorVersion} == "2" ]]; then
257265
prep_txz
258266
fi
259267

@@ -278,8 +286,8 @@ create_tarball() {
278286

279287
# Main
280288

281-
check_repo
282-
check_pkgs
289+
#check_repo
290+
#check_pkgs
283291

284292
# Prepare packages for upload
285293
if [[ ${DL} == 1 ]]; then

0 commit comments

Comments
 (0)