minor cleanups

- btcpayserver: remove unneeded trailing semicolons

- krops/get-sha256:
  `tail` is unneeded because `nix-prefetch-url` just outputs a single
  line containing the hash.
This commit is contained in:
Erik Arvstedt 2021-09-08 17:01:10 +02:00
parent 0d2db4e79f
commit 5087ce245f
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
2 changed files with 3 additions and 3 deletions

View File

@ -210,9 +210,9 @@ in {
install -m 600 ${configFile} '${cfg.btcpayserver.dataDir}/settings.config' install -m 600 ${configFile} '${cfg.btcpayserver.dataDir}/settings.config'
${optionalString (cfg.btcpayserver.lightningBackend == "lnd") '' ${optionalString (cfg.btcpayserver.lightningBackend == "lnd") ''
{ {
echo -n "${lndConfig}"; echo -n "${lndConfig}"
${pkgs.openssl}/bin/openssl x509 -noout -fingerprint -sha256 -in ${config.nix-bitcoin.secretsDir}/lnd-cert \ ${pkgs.openssl}/bin/openssl x509 -noout -fingerprint -sha256 -in ${config.nix-bitcoin.secretsDir}/lnd-cert \
| sed -e 's/.*=//;s/://g'; | sed -e 's/.*=//;s/://g'
} >> '${cfg.btcpayserver.dataDir}/settings.config' } >> '${cfg.btcpayserver.dataDir}/settings.config'
''} ''}
''; '';

View File

@ -5,7 +5,7 @@ set -euo pipefail
archive_hash () { archive_hash () {
repo=$1 repo=$1
rev=$2 rev=$2
nix-prefetch-url --unpack "https://github.com/${repo}/archive/${rev}.tar.gz" 2> /dev/null | tail -n 1 nix-prefetch-url --unpack "https://github.com/${repo}/archive/${rev}.tar.gz" 2> /dev/null
} }
echo "Fetching latest krops commit" echo "Fetching latest krops commit"