From ec714845fa7c8549605f57ae6e35df6bcd6afecd Mon Sep 17 00:00:00 2001
From: Fredrik Salomonsson <plattfot@posteo.net>
Date: Wed, 26 Nov 2025 20:53:56 -0800
Subject: [PATCH 1/5] Update build-aux/version to operate on the full version

Works better with my devtools to automatically commit version changes.
---
 build-aux/version | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/build-aux/version b/build-aux/version
index 556e728..26133f6 100755
--- a/build-aux/version
+++ b/build-aux/version
@@ -4,11 +4,7 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-major=2
-minor=5
-patch=0
-
-version=$major.$minor.$patch
+version=2.5.0
 
 read -rd '' help <<EOF
 Usage: $0 [OPTIONS...]
@@ -43,19 +39,20 @@ do
 key=$1
 case $key in
     -s|--short)
-        version=$major.$minor
+        result=${version%.*}
         shift
         ;;
     -M|--major)
-        version=$major
+        result=${version%%.*}
         shift
         ;;
     -m|--minor)
-        version=$minor
+        short=${version%.*}
+        result=${short#*.}
         shift
         ;;
     -p|--patch)
-        version=$patch
+        result=${version##*.}
         shift
         ;;
     -h|--help)
@@ -69,4 +66,4 @@ case $key in
 esac
 done
 
-echo $version
+echo "${result:-$version}"

From 2e5eaca5ce2ed69e878283273404061cc86ab539 Mon Sep 17 00:00:00 2001
From: Fredrik Salomonsson <plattfot@posteo.net>
Date: Wed, 26 Nov 2025 21:17:58 -0800
Subject: [PATCH 2/5] Set version in scrips using meson's configure_file [#52]

To avoid the issue of forgetting to bump them when releasing a new
version.  Which I've been doing for the last few versions.
---
 baksnapper.sh            |   2 +-
 baksnapperd-denotebak.sh |   2 +-
 baksnapperd.sh           |   2 +-
 meson.build              | 130 +++++++++++++++++----------------------
 4 files changed, 58 insertions(+), 78 deletions(-)
 mode change 100644 => 100755 baksnapperd-denotebak.sh

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 <<EOF
-baksnapper (baksnapper) 2.5.0
+baksnapper (baksnapper) @VERSION@
 Copyright (C) 2015-2025  Fredrik Salomonsson
 Copyright (C) 2021       Nathan Dehnel
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
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 <<EOF
-baksnapperd-denotebak (baksnapper) 2.4.0
+baksnapperd-denotebak (baksnapper) @VERSION@
 Copyright (C) 2025  Fredrik Salomonsson
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
 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 <<EOF
-baksnapperd (baksnapper) 2.4.0
+baksnapperd (baksnapper) @VERSION@
 Copyright (C) 2015-2025  Fredrik Salomonsson
 Copyright (C) 2021-2022  Nathan Dehnel
 Copyright (C) 2023       Juergen Gleiss
diff --git a/meson.build b/meson.build
index 1e46ca3..be0bb68 100644
--- a/meson.build
+++ b/meson.build
@@ -10,30 +10,34 @@ project(
 
 install_cmd = find_program('install')
 
-baksnapper = custom_target(
-  command: [install_cmd, '@INPUT@', '@OUTPUT@'],
+config_data = configuration_data({
+    'VERSION': meson.project_version(),
+})
+
+baksnapper = configure_file(
   input: 'baksnapper.sh',
   output: 'baksnapper',
+  configuration: config_data,
   install: true,
   install_dir: 'bin',
   install_mode: 'rwxr-xr-x',
   install_tag: 'runtime',
 )
 
-baksnapperd = custom_target(
-  command: [install_cmd, '@INPUT@', '@OUTPUT@'],
+baksnapperd = configure_file(
   input: 'baksnapperd.sh',
   output: 'baksnapperd',
+  configuration: config_data,
   install: true,
   install_dir: 'bin',
   install_mode: 'rwxr-xr-x',
   install_tag: 'runtime',
 )
 
-baksnapperd_denotebak = custom_target(
-  command: [install_cmd, '@INPUT@', '@OUTPUT@'],
+baksnapperd_denotebak = configure_file(
   input: 'baksnapperd-denotebak.sh',
   output: 'baksnapperd-denotebak',
+  configuration: config_data,
   install: true,
   install_dir: 'bin',
   install_mode: 'rwxr-xr-x',
@@ -90,53 +94,53 @@ test_env = environment()
 test_env.prepend('PATH', meson.current_source_dir() / 'tests/bin')
 test_env.set('MOCK_SSH_CONNECTION', '0')
 test_env.set('MOCK_SSH_KEY', 'foo.key=foo.example.com:bar.key=bar.example.com')
-test_env.set('MOCK_SSH_BAKSNAPPERD', baksnapperd[0].full_path())
+test_env.set('MOCK_SSH_BAKSNAPPERD', baksnapperd.full_path())
 
 denotebak_test_env = test_env
-denotebak_test_env.set('MOCK_SSH_BAKSNAPPERD', baksnapperd_denotebak[0].full_path())
+denotebak_test_env.set('MOCK_SSH_BAKSNAPPERD', baksnapperd_denotebak.full_path())
 
 runner = find_program('./tests/runner.scm')
 
 test_configuration = {
   'default': {
-    'DAEMON': baksnapperd[0].full_path(),
+    'DAEMON': baksnapperd.full_path(),
   },
   'latest': {
-    'DAEMON': baksnapperd[0].full_path(),
+    'DAEMON': baksnapperd.full_path(),
     'PRUNE': 'NO',
     'ALL': 'NO',
     'VERBOSE': 'NO',
     'LINK': 'YES',
   },
   'prune': {
-    'DAEMON': baksnapperd[0].full_path(),
+    'DAEMON': baksnapperd.full_path(),
     'PRUNE': 'YES',
     'ALL': 'NO',
     'VERBOSE': 'NO',
   },
   'all': {
-    'DAEMON': baksnapperd[0].full_path(),
+    'DAEMON': baksnapperd.full_path(),
     'ALL': 'YES',
     'VERBOSE': 'NO',
   },
   'denotebak-default': {
-    'DAEMON': baksnapperd_denotebak[0].full_path(),
+    'DAEMON': baksnapperd_denotebak.full_path(),
   },
   'denotebak-latest': {
-    'DAEMON': baksnapperd_denotebak[0].full_path(),
+    'DAEMON': baksnapperd_denotebak.full_path(),
     'PRUNE': 'NO',
     'ALL': 'NO',
     'VERBOSE': 'NO',
     'LINK': 'YES',
   },
   'denotebak-prune': {
-    'DAEMON': baksnapperd_denotebak[0].full_path(),
+    'DAEMON': baksnapperd_denotebak.full_path(),
     'PRUNE': 'YES',
     'ALL': 'NO',
     'VERBOSE': 'NO',
   },
   'denotebak-all': {
-    'DAEMON': baksnapperd_denotebak[0].full_path(),
+    'DAEMON': baksnapperd_denotebak.full_path(),
     'ALL': 'YES',
     'VERBOSE': 'NO',
   },
@@ -149,13 +153,12 @@ foreach test_entry: [
       '--expected', '3',
     ],
     'baksnapper-args': [
-      baksnapper[0].full_path(),
-      '--daemon', baksnapperd[0].full_path(),
+      baksnapper,
+      '--daemon', baksnapperd,
     ],
     'configfile': 'default',
     'configfile-baksnapper-args': [],
     'suite': ['backup'],
-    'depends': [baksnapperd],
     'env': test_env,
   },
   {
@@ -166,14 +169,13 @@ foreach test_entry: [
       '--expected-latest', '3',
     ],
     'baksnapper-args': [
-      baksnapper[0].full_path(),
-      '--daemon', baksnapperd[0].full_path(),
+      baksnapper,
+      '--daemon', baksnapperd,
       '--link',
     ],
     'configfile': 'latest',
     'configfile-baksnapper-args': [],
     'suite': ['latest'],
-    'depends': [baksnapperd],
     'env': test_env,
   },
   {
@@ -184,14 +186,13 @@ foreach test_entry: [
       '--expected', '1,2,3,6,8:p=6',
     ],
     'baksnapper-args': [
-      baksnapper[0].full_path(),
-      '--daemon', baksnapperd[0].full_path(),
+      baksnapper,
+      '--daemon', baksnapperd,
       '--prune',
     ],
     'configfile': 'prune',
     'configfile-baksnapper-args': [],
     'suite': ['prune'],
-    'depends': [baksnapperd],
     'env': test_env,
   },
   {
@@ -201,14 +202,13 @@ foreach test_entry: [
       '--expected', '2',
     ],
     'baksnapper-args': [
-      baksnapper[0].full_path(),
-      '--daemon', baksnapperd[0].full_path(),
+      baksnapper,
+      '--daemon', baksnapperd,
       '--snapshot', '2',
     ],
     'configfile': 'default',
     'configfile-baksnapper-args': [],
     'suite': ['backup'],
-    'depends': [baksnapperd],
     'env': test_env,
   },
   {
@@ -219,14 +219,13 @@ foreach test_entry: [
       '--expected', '2,3',
     ],
     'baksnapper-args': [
-      baksnapper[0].full_path(),
-      '--daemon', baksnapperd[0].full_path(),
+      baksnapper,
+      '--daemon', baksnapperd,
       '--delete', '1',
     ],
     'configfile': 'default',
     'configfile-baksnapper-args': [],
     'suite': ['delete'],
-    'depends': [baksnapperd],
     'env': test_env,
   },
   {
@@ -237,14 +236,13 @@ foreach test_entry: [
       '--expected', '2',
     ],
     'baksnapper-args': [
-      baksnapper[0].full_path(),
-      '--daemon', baksnapperd[0].full_path(),
+      baksnapper,
+      '--daemon', baksnapperd,
       '--delete', '1,3',
     ],
     'configfile': 'default',
     'configfile-baksnapper-args': [],
     'suite': ['delete'],
-    'depends': [baksnapperd],
     'env': test_env,
   },
   {
@@ -255,13 +253,12 @@ foreach test_entry: [
       '--expected', '64,66:p=64,76:p=66,83:p=76,91:p=83,92:p=83,93:p=92',
     ],
     'baksnapper-args': [
-      baksnapper[0].full_path(),
-      '--daemon', baksnapperd[0].full_path(),
+      baksnapper,
+      '--daemon', baksnapperd,
     ],
     'configfile': 'default',
     'configfile-baksnapper-args': [],
     'suite': ['backup'],
-    'depends': [baksnapperd],
     'env': test_env,
   },
   # https://github.com/plattfot/baksnapper/issues/27
@@ -273,14 +270,13 @@ foreach test_entry: [
       '--expected', '64,65:p=64,66:p=64,76:p=66,83:p=76,91:p=83,92:p=83,93:p=92',
     ],
     'baksnapper-args': [
-      baksnapper[0].full_path(),
-      '--daemon', baksnapperd[0].full_path(),
+      baksnapper,
+      '--daemon', baksnapperd,
       '--all',
     ],
     'configfile': 'all',
     'configfile-baksnapper-args': [],
     'suite': ['backup'],
-    'depends': [baksnapperd],
     'env': test_env,
   },
   # DeNotebak
@@ -296,13 +292,12 @@ foreach test_entry: [
       '--type', 'denotebak',
     ],
     'baksnapper-args': [
-      baksnapper[0].full_path(),
-      '--daemon', baksnapperd_denotebak[0].full_path(),
+      baksnapper,
+      '--daemon', baksnapperd_denotebak,
     ],
     'configfile': 'denotebak-default',
     'configfile-baksnapper-args': [],
     'suite': ['denotebak', 'backup'],
-    'depends': [baksnapperd_denotebak],
     'env': denotebak_test_env,
   },
   {
@@ -318,14 +313,13 @@ foreach test_entry: [
       '--type', 'denotebak',
     ],
     'baksnapper-args': [
-      baksnapper[0].full_path(),
-      '--daemon', baksnapperd_denotebak[0].full_path(),
+      baksnapper,
+      '--daemon', baksnapperd_denotebak,
       '--link',
     ],
     'configfile': 'denotebak-latest',
     'configfile-baksnapper-args': [],
     'suite': ['denotebak', 'latest'],
-    'depends': [baksnapperd_denotebak],
     'env': denotebak_test_env,
   },
   {
@@ -354,14 +348,13 @@ foreach test_entry: [
       '--type', 'denotebak',
     ],
     'baksnapper-args': [
-      baksnapper[0].full_path(),
-      '--daemon', baksnapperd_denotebak[0].full_path(),
+      baksnapper,
+      '--daemon', baksnapperd_denotebak,
       '--prune',
     ],
     'configfile': 'denotebak-prune',
     'configfile-baksnapper-args': [],
     'suite': ['denotebak', 'prune'],
-    'depends': [baksnapperd_denotebak],
     'env': denotebak_test_env,
   },
   {
@@ -376,14 +369,13 @@ foreach test_entry: [
       '--type', 'denotebak',
     ],
     'baksnapper-args': [
-      baksnapper[0].full_path(),
-      '--daemon', baksnapperd_denotebak[0].full_path(),
+      baksnapper,
+      '--daemon', baksnapperd_denotebak,
       '--snapshot', '20251025T150000',
     ],
     'configfile': 'denotebak-default',
     'configfile-baksnapper-args': [],
     'suite': ['denotebak', 'backup'],
-    'depends': [baksnapperd_denotebak],
     'env': denotebak_test_env,
   },
   {
@@ -403,14 +395,13 @@ foreach test_entry: [
       '--type', 'denotebak',
     ],
     'baksnapper-args': [
-      baksnapper[0].full_path(),
-      '--daemon', baksnapperd_denotebak[0].full_path(),
+      baksnapper,
+      '--daemon', baksnapperd_denotebak,
       '--delete', '20251025T140000',
     ],
     'configfile': 'denotebak-default',
     'configfile-baksnapper-args': [],
     'suite': ['denotebak', 'delete'],
-    'depends': [baksnapperd_denotebak],
     'env': denotebak_test_env,
   },
   {
@@ -429,14 +420,13 @@ foreach test_entry: [
       '--type', 'denotebak',
     ],
     'baksnapper-args': [
-      baksnapper[0].full_path(),
-      '--daemon', baksnapperd_denotebak[0].full_path(),
+      baksnapper,
+      '--daemon', baksnapperd_denotebak,
       '--delete', '20251025T140000,20251025T160000',
     ],
     'configfile': 'denotebak-default',
     'configfile-baksnapper-args': [],
     'suite': ['denotebak', 'delete'],
-    'depends': [baksnapperd_denotebak],
     'env': denotebak_test_env,
   },
   {
@@ -473,13 +463,12 @@ foreach test_entry: [
       '--type', 'denotebak',
     ],
     'baksnapper-args': [
-      baksnapper[0].full_path(),
-      '--daemon', baksnapperd_denotebak[0].full_path(),
+      baksnapper,
+      '--daemon', baksnapperd_denotebak,
     ],
     'configfile': 'denotebak-default',
     'configfile-baksnapper-args': [],
     'suite': ['denotebak', 'backup'],
-    'depends': [baksnapperd_denotebak],
     'env': denotebak_test_env,
   },
   {
@@ -518,14 +507,13 @@ foreach test_entry: [
       '--type', 'denotebak',
     ],
     'baksnapper-args': [
-      baksnapper[0].full_path(),
-      '--daemon', baksnapperd_denotebak[0].full_path(),
+      baksnapper,
+      '--daemon', baksnapperd_denotebak,
       '--all',
     ],
     'configfile': 'denotebak-all',
     'configfile-baksnapper-args': [],
     'suite': ['denotebak', 'backup'],
-    'depends': [baksnapperd_denotebak],
     'env': denotebak_test_env,
   },
 ]
@@ -660,9 +648,7 @@ foreach test_entry: [
                 ['--'] +
                 test_entry['baksnapper-args'] + conf['baksnapper-args'] +
                 ssh_key['args'] + baksnapper_args,
-          depends: [
-            baksnapper,
-          ] + test_entry['depends'] + test_depends,
+          depends: test_depends,
           suite: conf['suite'] + test_entry['suite'],
         )
       endforeach
@@ -671,21 +657,15 @@ foreach test_entry: [
 endforeach
 test(
   'not-enough-inputs',
-  baksnapper[0],
+  baksnapper,
   env: test_env,
-  depends: [
-    baksnapper,
-  ],
   should_fail: true,
 )
 
 test(
   'not-enough-inputs-src-dest',
-  baksnapper[0],
+  baksnapper,
   args: ['.'],
   env: test_env,
-  depends: [
-    baksnapper,
-  ],
   should_fail: true,
 )

From 974b3b23ac10c9ff58f77d571a5d0960a2b2bc26 Mon Sep 17 00:00:00 2001
From: Fredrik Salomonsson <plattfot@posteo.net>
Date: Wed, 26 Nov 2025 21:32:05 -0800
Subject: [PATCH 3/5] Update Makefile to replace @VERSION@ with the current
 version [#52]

---
 Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 $|/

From 7731a477fd43f6db689c91bb24c2fbd5018d5662 Mon Sep 17 00:00:00 2001
From: Fredrik Salomonsson <plattfot@posteo.net>
Date: Wed, 26 Nov 2025 21:33:56 -0800
Subject: [PATCH 4/5] changelog: set version in scripts using meson/make

---
 .../20251126T213311--set-version-from-mesonmake__changed.md   | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 CHANGELOG.d/20251126T213311--set-version-from-mesonmake__changed.md

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 @@
+<!-- SPDX-FileCopyrightText: 2025 Fredrik Salomonsson <plattfot@posteo.net> -->
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
+### Changed
+- Set version in scripts using meson/make. [#52](https://github.com/plattfot/baksnapper/issues/52)

From 230ec84cf85a9e40b2488e28cfab2fcbf508ec0a Mon Sep 17 00:00:00 2001
From: Fredrik Salomonsson <plattfot@posteo.net>
Date: Wed, 26 Nov 2025 21:38:25 -0800
Subject: [PATCH 5/5] Add simple smoke tests for the scripts in the Makefile CI

---
 .github/workflows/makefile.yml | 4 ++++
 1 file changed, 4 insertions(+)

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