From 60c6153ab12229fa3d067460614131da5e67f6da Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Tue, 4 May 2021 15:04:36 +0200 Subject: btcpayserver/update.sh: auto-update nbxplorer It's now sufficient to run a single script (btcpayserver/update.sh) to update btcpayserver. This simplifies maintenance. nbxplorer is a strict dependency of btcpayserver. --- pkgs/applications/blockchains/btcpayserver/update.sh | 7 ++++++- pkgs/applications/blockchains/nbxplorer/util/create-deps.sh | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/btcpayserver/update.sh b/pkgs/applications/blockchains/btcpayserver/update.sh index 1f7dbedd020..9debe6780f2 100755 --- a/pkgs/applications/blockchains/btcpayserver/update.sh +++ b/pkgs/applications/blockchains/btcpayserver/update.sh @@ -2,5 +2,10 @@ set -euo pipefail scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) +cd "$scriptDir" -"$scriptDir"/../nbxplorer/util/update-common.sh btcpayserver "$scriptDir"/deps.nix +echo "Updating nbxplorer" +../nbxplorer/update.sh +echo +echo "Updating btcpayserver" +../nbxplorer/util/update-common.sh btcpayserver deps.nix diff --git a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh index 1402d1cd1eb..14b1687dfff 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh @@ -6,7 +6,7 @@ set -euo pipefail # Expects $pkgSrc to contain a single .sln file. pkgSrc=$1 -depsFile=$2 +depsFile=$(realpath "$2") sln=$(cd "$pkgSrc"; find * -maxdepth 0 -name '*.sln' | head -1) [[ $sln ]] || { echo "No .sln file in $pkgSrc" ; exit 1; } -- cgit 1.4.1