Skip to content

Commit b95970a

Browse files
committed
debian package version derived from executable
1 parent 4912afd commit b95970a

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

build-docker/bookworm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y build-essen
88
COPY . /app
99
WORKDIR /app
1010

11-
RUN ./scripts/build.sh "cmake build-essential pkg-config git" ais-catcher amd64 1.0 ""
11+
RUN ./scripts/build.sh "cmake build-essential pkg-config git" ais-catcher amd64 ""
1212

1313
CMD ["cp", "ais-catcher.deb", "/output/"]

scripts/build.sh

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -252,23 +252,17 @@ create_debian_package() {
252252
build_deps=$1
253253
deb_package=$2
254254
package_arch=$3
255-
package_version_override=$4
256-
install_deps=$5
255+
install_deps=$4
257256

258257
# Install build dependencies
259258
install_dependencies "libairspy-dev libairspyhf-dev libhackrf-dev libzmq3-dev libssl-dev zlib1g-dev libsqlite3-dev libusb-1.0-0-dev libpq-dev $build_deps"
260259

261260
# Build the project
262261
build_project
263262

264-
# Extract or use provided package version
265-
if [ -n "$package_version_override" ]; then
266-
package_version=$package_version_override
267-
echo "Using provided package version: $package_version"
268-
else
269-
package_version=$(extract_package_version)
270-
echo "Using extracted package version: $package_version"
271-
fi
263+
# Always extract package version from binary
264+
package_version=$(extract_package_version)
265+
echo "Using extracted package version: $package_version"
272266

273267
# Create Debian package if specified
274268
create_debian_package "$deb_package" "$package_arch" "$package_version" "$install_deps"

0 commit comments

Comments
 (0)