From 0447c5bacbe4c7d431681b480997651e2f43d0d1 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Tue, 8 Nov 2022 22:45:19 +0100
Subject: [PATCH] treewide: set shebang for bash scripts

These scripts previously failed when called with syscalls like
`execve` (used by, e.g., Python's `subprocess.run`) that use no default
interpreter for scripts without a shebang.
---
 modules/bitcoind.nix       | 2 +-
 modules/clightning.nix     | 2 +-
 modules/lightning-loop.nix | 2 +-
 modules/lightning-pool.nix | 2 +-
 modules/liquid.nix         | 4 ++--
 modules/lnd.nix            | 2 +-
 modules/nix-bitcoin.nix    | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/bitcoind.nix b/modules/bitcoind.nix
index 97de5b5..3adbd0e 100644
--- a/modules/bitcoind.nix
+++ b/modules/bitcoind.nix
@@ -265,7 +265,7 @@ let
       cli = mkOption {
         readOnly = true;
         type = types.package;
-        default = pkgs.writeScriptBin "bitcoin-cli" ''
+        default = pkgs.writers.writeBashBin "bitcoin-cli" ''
           exec ${cfg.package}/bin/bitcoin-cli -datadir='${cfg.dataDir}' "$@"
         '';
         defaultText = "(See source)";
diff --git a/modules/clightning.nix b/modules/clightning.nix
index 612d57e..dba8d9a 100644
--- a/modules/clightning.nix
+++ b/modules/clightning.nix
@@ -81,7 +81,7 @@ let
     };
     cli = mkOption {
       readOnly = true;
-      default = pkgs.writeScriptBin "lightning-cli" ''
+      default = pkgs.writers.writeBashBin "lightning-cli" ''
         ${cfg.package}/bin/lightning-cli --lightning-dir='${cfg.dataDir}' "$@"
       '';
       defaultText = "(See source)";
diff --git a/modules/lightning-loop.nix b/modules/lightning-loop.nix
index 1bd526c..fdafcf2 100644
--- a/modules/lightning-loop.nix
+++ b/modules/lightning-loop.nix
@@ -73,7 +73,7 @@ let
       '';
     };
     cli = mkOption {
-      default = pkgs.writeScriptBin "loop" ''
+      default = pkgs.writers.writeBashBin "loop" ''
         ${cfg.package}/bin/loop \
         --rpcserver ${nbLib.addressWithPort cfg.rpcAddress cfg.rpcPort} \
         --macaroonpath '${cfg.dataDir}/${network}/loop.macaroon' \
diff --git a/modules/lightning-pool.nix b/modules/lightning-pool.nix
index 240c283..c268e17 100644
--- a/modules/lightning-pool.nix
+++ b/modules/lightning-pool.nix
@@ -49,7 +49,7 @@ let
       description = "Extra lines appended to the configuration file.";
     };
     cli = mkOption {
-      default = pkgs.writeScriptBin "pool" ''
+      default = pkgs.writers.writeBashBin "pool" ''
         exec ${cfg.package}/bin/pool \
           --rpcserver ${nbLib.addressWithPort cfg.rpcAddress cfg.rpcPort} \
           --network ${network} \
diff --git a/modules/liquid.nix b/modules/liquid.nix
index f5ffb14..5197d5b 100644
--- a/modules/liquid.nix
+++ b/modules/liquid.nix
@@ -145,14 +145,14 @@ let
       };
       cli = mkOption {
         readOnly = true;
-        default = pkgs.writeScriptBin "elements-cli" ''
+        default = pkgs.writers.writeBashBin "elements-cli" ''
           ${nbPkgs.elementsd}/bin/elements-cli -datadir='${cfg.dataDir}' "$@"
         '';
         defaultText = "(See source)";
         description = "Binary to connect with the liquidd instance.";
       };
       swapCli = mkOption {
-        default = pkgs.writeScriptBin "liquidswap-cli" ''
+        default = pkgs.writers.writeBashBin "liquidswap-cli" ''
           ${nbPkgs.liquid-swap}/bin/liquidswap-cli -c '${cfg.dataDir}/elements.conf' "$@"
         '';
         defaultText = "(See source)";
diff --git a/modules/lnd.nix b/modules/lnd.nix
index 3fd59f2..893762e 100644
--- a/modules/lnd.nix
+++ b/modules/lnd.nix
@@ -109,7 +109,7 @@ let
       description = "The package providing lnd binaries.";
     };
     cli = mkOption {
-      default = pkgs.writeScriptBin "lncli"
+      default = pkgs.writers.writeBashBin "lncli"
         # Switch user because lnd makes datadir contents readable by user only
         ''
           ${runAsUser} ${cfg.user} ${cfg.package}/bin/lncli \
diff --git a/modules/nix-bitcoin.nix b/modules/nix-bitcoin.nix
index e00d497..27b7b04 100644
--- a/modules/nix-bitcoin.nix
+++ b/modules/nix-bitcoin.nix
@@ -27,7 +27,7 @@ with lib;
       # Related issue: https://github.com/NixOS/nixpkgs/issues/94236
       torify = mkOption {
         readOnly = true;
-        default = pkgs.writeScriptBin "torify" ''
+        default = pkgs.writers.writeBashBin "torify" ''
           ${pkgs.tor}/bin/torify \
             --address ${config.services.tor.client.socksListenAddress.addr} \
             "$@"