From 89d5ef1295b0b78d23856741ac914f8868550173 Mon Sep 17 00:00:00 2001
From: Sandro Jäckel <sandro.jaeckel@gmail.com>
Date: Mon, 6 Jun 2022 02:12:53 +0200
Subject: ArchiSteamFarm: update programm and web-ui in one run

---
 pkgs/applications/misc/ArchiSteamFarm/updater.sh       | 3 +++
 pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/ArchiSteamFarm/updater.sh b/pkgs/applications/misc/ArchiSteamFarm/updater.sh
index 6735c293c67..9baedde025d 100755
--- a/pkgs/applications/misc/ArchiSteamFarm/updater.sh
+++ b/pkgs/applications/misc/ArchiSteamFarm/updater.sh
@@ -15,6 +15,7 @@ if [[ "$new_version" == "$old_version" ]]; then
   fi
 fi
 
+asf_path=$(pwd)
 cd ../../../..
 
 nixpkgs_path=$(pwd)
@@ -47,3 +48,5 @@ trap '
   popd
   rm -r "$src"
 ' EXIT
+cd "$asf_path"
+./web-ui/update.sh
diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh b/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh
index b6e72bf19cb..90f8baf8e1b 100755
--- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh
+++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh
@@ -1,11 +1,13 @@
 #!/usr/bin/env nix-shell
-#! nix-shell -i bash -p nodePackages.node2nix gnused jq curl
+#! nix-shell -I nixpkgs=../../../.. -i bash -p nodePackages.node2nix gnused jq curl
+set -eoux pipefail
 
+pushd ../../../..
 version=$(nix-instantiate --strict --eval -A ArchiSteamFarm.version | jq -r)
+popd
+pushd "$(dirname "$0")"
 ui=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/contents/ASF-ui?ref=$version" | jq -r .sha)
 
-pushd $(dirname "$0")
-
 curl "https://raw.githubusercontent.com/JustArchiNET/ASF-ui/$ui/package-lock.json" -o package-lock.json
 curl "https://raw.githubusercontent.com/JustArchiNET/ASF-ui/$ui/package.json" -o package.json
 
-- 
cgit 1.4.1