From e03e87dd645a23bba1d3abc98c6ed765abf510ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20J=C3=A4ger?= <pascal.jaeger@leimstift.de>
Date: Wed, 7 Dec 2022 15:01:10 +0100
Subject: [PATCH 1/2] grub-btrfsd: Use bash as interpreter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix: #248

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
---
 config      | 2 +-
 grub-btrfsd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config b/config
index 50905b9..7313f32 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-GRUB_BTRFS_VERSION=4.12-master-2022-12-04T21:11:00+00:00
+GRUB_BTRFS_VERSION=4.12-master-2022-12-07T14:01:10+00:00
 
 # Disable grub-btrfs.
 # Default: "false"
diff --git a/grub-btrfsd b/grub-btrfsd
index 198b0ad..1c9ec82 100755
--- a/grub-btrfsd
+++ b/grub-btrfsd
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 # Copyright 2022 Pascal Jaeger
 # Distributed under the terms of the GNU General Public License v3
 # Update GRUB when new BTRFS snapshots are created.

From 89ef805e814efdb4632bba44e6db5ad380437dd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20J=C3=A4ger?= <pascal.jaeger@leimstift.de>
Date: Sat, 10 Dec 2022 22:20:15 +0100
Subject: [PATCH 2/2] grub-btrfsd: do no append with += to optional args
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This does not work anymore, but it should be similar to the systemd
service file anyway, where things are just written in one line.

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
---
 README.md         | 11 ++++-------
 config            |  2 +-
 grub-btrfsd.confd | 11 ++++-------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 146fb01..df6df10 100644
--- a/README.md
+++ b/README.md
@@ -287,18 +287,15 @@ snapshots="/.snapshots" # Snapper in the root directory
 #snapshots="/run/timeshift/backup/timeshift-btrfs/snapshots" # Timeshift < v22.06
 
 ## Optional arguments to run with the daemon
+# Append options to this like this:
+# optional_args="--syslog --timeshift-auto --verbose"
 # Possible options are:
 # -t, --timeshift-auto  Automatically detect Timeshifts snapshot directory for timeshift >= 22.06
-# -o, --timeshift-old   Activate for timeshift versions <22.06
+# -o, --timeshift-old   Look for snapshots in directory of Timeshift <v22.06 (requires --timeshift-auto)
 # -l, --log-file        Specify a logfile to write to
 # -v, --verbose         Let the log of the daemon be more verbose
 # -s, --syslog          Write to syslog
-# Uncomment the line to activate the option
-optional_args+="--syslog " # write to syslog by default
-#optional_args+="--timeshift-auto "
-#optional_args+="--timeshift-old "
-#optional_args+="--log-file /var/log/grub-btrfsd.log "
-#optional_args+="--verbose "
+optional_args="--syslog"
 ```
 
 After that, the daemon should be restarted with
diff --git a/config b/config
index 7313f32..5a18f4b 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-GRUB_BTRFS_VERSION=4.12-master-2022-12-07T14:01:10+00:00
+GRUB_BTRFS_VERSION=4.12-master-2022-12-10T21:20:15+00:00
 
 # Disable grub-btrfs.
 # Default: "false"
diff --git a/grub-btrfsd.confd b/grub-btrfsd.confd
index 47cfb03..926b0c7 100644
--- a/grub-btrfsd.confd
+++ b/grub-btrfsd.confd
@@ -6,15 +6,12 @@ snapshots="/.snapshots" # Snapper in the root directory
 #snapshots="/run/timeshift/backup/timeshift-btrfs/snapshots" # Timeshift < v22.06
 
 ## Optional arguments to run with the daemon
+# Append options to this like this:
+# optional_args="--syslog --timeshift-auto --verbose"
 # Possible options are:
 # -t, --timeshift-auto  Automatically detect Timeshifts snapshot directory for timeshift >= 22.06
-# -o, --timeshift-old   Activate for timeshift versions <22.06
+# -o, --timeshift-old   Look for snapshots in directory of Timeshift <v22.06 (requires --timeshift-auto)
 # -l, --log-file        Specify a logfile to write to
 # -v, --verbose         Let the log of the daemon be more verbose
 # -s, --syslog          Write to syslog
-# Uncomment the line to activate the option
-optional_args+="--syslog " # write to syslog by default
-#optional_args+="--timeshift-auto "
-#optional_args+="--timeshift-old "
-#optional_args+="--log-file /var/log/grub-btrfsd.log "
-#optional_args+="--verbose "
+optional_args="--syslog"