summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@gmail.com>2022-06-06 01:33:03 +0200
committerSandro Jäckel <sandro.jaeckel@gmail.com>2022-06-06 02:11:51 +0200
commit1841ad02a3a6ce601b39c1ad5a9a9fb8ca8c9be6 (patch)
treeb9ecf8b492094725932df5c2fb3779e613d16cb3
parent2d012163f23495d81116960fae15288db5285ec7 (diff)
downloadnixpkgs-1841ad02a3a6ce601b39c1ad5a9a9fb8ca8c9be6.tar
nixpkgs-1841ad02a3a6ce601b39c1ad5a9a9fb8ca8c9be6.tar.gz
nixpkgs-1841ad02a3a6ce601b39c1ad5a9a9fb8ca8c9be6.tar.bz2
nixpkgs-1841ad02a3a6ce601b39c1ad5a9a9fb8ca8c9be6.tar.lz
nixpkgs-1841ad02a3a6ce601b39c1ad5a9a9fb8ca8c9be6.tar.xz
nixpkgs-1841ad02a3a6ce601b39c1ad5a9a9fb8ca8c9be6.tar.zst
nixpkgs-1841ad02a3a6ce601b39c1ad5a9a9fb8ca8c9be6.zip
ArchiSteamFarm: fix shellcheck problems
-rwxr-xr-xpkgs/applications/misc/ArchiSteamFarm/updater.sh7
-rwxr-xr-xpkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh8
2 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/applications/misc/ArchiSteamFarm/updater.sh b/pkgs/applications/misc/ArchiSteamFarm/updater.sh
index 3c361d70239..6735c293c67 100755
--- a/pkgs/applications/misc/ArchiSteamFarm/updater.sh
+++ b/pkgs/applications/misc/ArchiSteamFarm/updater.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -I nixpkgs=../../../.. -i bash -p curl gnused jq common-updater-scripts nuget-to-nix
-set -exo pipefail
+set -euox pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
 deps_file="$(realpath ./deps)"
@@ -18,7 +18,7 @@ fi
 cd ../../../..
 
 nixpkgs_path=$(pwd)
-if [[ "$1" != "--deps-only" ]]; then
+if [[ "${1:-}" != "--deps-only" ]]; then
     update-source-version ArchiSteamFarm "$new_version"
 fi
 store_src="$(nix-build -A ArchiSteamFarm.src --no-out-link)"
@@ -36,12 +36,11 @@ for i in $platforms; do
   nix-shell -I nixpkgs="$nixpkgs_path" -p dotnet-sdk_6 --argstr system $i --run "
      mkdir ./nuget_pkgs-$i
      for project in ArchiSteamFarm/ArchiSteamFarm.csproj ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj; do
-       dotnet restore $project --packages ./nuget_pkgs-$i
+       dotnet restore \$project --packages ./nuget_pkgs-$i
      done;
 
      nuget-to-nix ./nuget_pkgs-$i > $deps_file-$i.nix" \
   || echo "Did you set up binformat for $i?";
-
 done;
 
 trap '
diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh b/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh
index dfe394c7858..b6e72bf19cb 100755
--- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh
+++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh
@@ -2,16 +2,16 @@
 #! nix-shell -i bash -p nodePackages.node2nix gnused jq curl
 
 version=$(nix-instantiate --strict --eval -A ArchiSteamFarm.version | jq -r)
-ui=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/contents/ASF-ui?ref=${version} | jq -r .sha)
+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
+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
 
 # update-source-version doesn't work for some reason
 sed -i "s/rev\\s*=\\s*.*/rev = \"$ui\";/" default.nix
-sed -i "s/sha256\\s*=\\s*.*/sha256 = \"$(nix-prefetch-url --unpack https://github.com/JustArchiNET/ASF-ui/archive/$ui.tar.gz)\";/" default.nix
+sed -i "s/sha256\\s*=\\s*.*/sha256 = \"$(nix-prefetch-url --unpack "https://github.com/JustArchiNET/ASF-ui/archive/$ui.tar.gz")\";/" default.nix
 
 node2nix \
   --nodejs-14 \