From 6880d58344bcb27bb6f4efd18643ddd160c28f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 23 Dec 2024 14:43:46 +0100
Subject: [PATCH] borgbackup: avoid broken pipe

---
 clanModules/borgbackup/roles/client.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/clanModules/borgbackup/roles/client.nix b/clanModules/borgbackup/roles/client.nix
index ef8e19496..d1f342e83 100644
--- a/clanModules/borgbackup/roles/client.nix
+++ b/clanModules/borgbackup/roles/client.nix
@@ -150,12 +150,12 @@ in
           lib.concatMapStringsSep "\n" (
             dest:
             # we need yes here to skip the changed url verification
-            ''yes y | borg-job-${dest.name} list --json | jq '[.archives[] | {"name": ("${dest.name}::${dest.repo}::" + .name)}]' ''
+            ''echo y | borg-job-${dest.name} list --json | jq '[.archives[] | {"name": ("${dest.name}::${dest.repo}::" + .name)}]' ''
           ) (lib.attrValues cfg.destinations)
         }) | ${pkgs.jq}/bin/jq -s 'add // []'
       '')
       (pkgs.writeShellScriptBin "borgbackup-restore" ''
-        set -efux
+        set -efu -o pipefail
         cd /
         IFS=':' read -ra FOLDER <<< "$FOLDERS"
         job_name=$(echo "$NAME" | ${pkgs.gawk}/bin/awk -F'::' '{print $1}')
@@ -164,7 +164,7 @@ in
           echo "borg-job-$job_name not found: Backup name is invalid" >&2
           exit 1
         fi
-        yes y | borg-job-"$job_name" extract --list "$backup_name" "''${FOLDER[@]}"
+        echo y | borg-job-"$job_name" extract --list "$backup_name" "''${FOLDER[@]}"
       '')
     ];