Merge fort-nix/nix-bitcoin#569: treewide: set shebang for bash scripts

0447c5bacb treewide: set shebang for bash scripts (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 0447c5bacb

Tree-SHA512: a3160833ae445a8b25f559f9e76a2c86537041d731b7404db05e388ec4e2afd7028a06cfbd1ba05b827b1270c3278836b603dab4b9bf3551795298e22bf9e734
This commit is contained in:
Jonas Nick 2022-11-10 11:08:12 +00:00
commit 1800ed7cb3
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
7 changed files with 8 additions and 8 deletions

View File

@ -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)";

View File

@ -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)";

View File

@ -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' \

View File

@ -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} \

View File

@ -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)";

View File

@ -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 \

View File

@ -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} \
"$@"