diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 02f338e..086ec6a 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -21,3 +21,7 @@ jobs: run: mkdir -p build/{usr/bin,usr/lib,etc} - name: Build and install run: make install PREFIX=build + - name: Smoke test baksnapper + run: ./build/usr/bin/baksnapper --version + - name: Smoke test baksnapperd + run: ./build/usr/bin/baksnapperd --version diff --git a/CHANGELOG.d/20251126T213311--set-version-from-mesonmake__changed.md b/CHANGELOG.d/20251126T213311--set-version-from-mesonmake__changed.md new file mode 100644 index 0000000..8f054fc --- /dev/null +++ b/CHANGELOG.d/20251126T213311--set-version-from-mesonmake__changed.md @@ -0,0 +1,4 @@ + + +### Changed +- Set version in scripts using meson/make. [#52](https://github.com/plattfot/baksnapper/issues/52) diff --git a/Makefile b/Makefile index 4897454..00306e6 100644 --- a/Makefile +++ b/Makefile @@ -30,9 +30,13 @@ $(PREFIX_BIN) $(PREFIX_LIB)/systemd/system $(PREFIX_ETC)/baksnapper/example: .PHONY: install bin systemd etc install: bin systemd +__root_dir=$(dir $(abspath $(lastword $(MAKEFILE_LIST)))) +__version=$(shell $(__root_dir)build-aux/version) bin: | $(PREFIX_BIN) - @install baksnapper.sh $|/baksnapper - @install baksnapperd.sh $|/baksnapperd + @sed 's/@VERSION@/${__version}/' baksnapper.sh > $|/baksnapper + @chmod 744 $|/baksnapper + @sed 's/@VERSION@/${__version}/' baksnapperd.sh > $|/baksnapperd + @chmod 744 $|/baksnapperd systemd: etc | $(PREFIX_LIB)/systemd/system @install --mode=644 systemd/baksnapper@.timer $|/ diff --git a/baksnapper.sh b/baksnapper.sh index 0ba3b47..fbafcab 100755 --- a/baksnapper.sh +++ b/baksnapper.sh @@ -127,7 +127,7 @@ Fredrik "PlaTFooT" Salomonsson EOF read -rd '' version <. diff --git a/baksnapperd-denotebak.sh b/baksnapperd-denotebak.sh old mode 100644 new mode 100755 index 65244a3..aee729f --- a/baksnapperd-denotebak.sh +++ b/baksnapperd-denotebak.sh @@ -7,7 +7,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later read -rd '' version <. This is free software: you are free to change and redistribute it. diff --git a/baksnapperd.sh b/baksnapperd.sh index 9cdbb9c..280989a 100755 --- a/baksnapperd.sh +++ b/baksnapperd.sh @@ -9,7 +9,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later read -rd '' version <