From 15313692cdad6fc066bfa4c441ada9bb9b10804a Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sat, 9 Apr 2022 02:05:44 +0200 Subject: [PATCH] mastodon.updateScript: use correct input for nix-prefetch-git, better formatting --- pkgs/servers/mastodon/update.nix | 4 +-- pkgs/servers/mastodon/update.sh | 44 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/servers/mastodon/update.nix b/pkgs/servers/mastodon/update.nix index 2e7df482530f..1bd557a74a5b 100644 --- a/pkgs/servers/mastodon/update.nix +++ b/pkgs/servers/mastodon/update.nix @@ -6,12 +6,12 @@ , bundix , coreutils , diffutils -, nix-prefetch-github +, nix-prefetch-git , gnused , jq }: let - binPath = lib.makeBinPath [ yarn2nix bundix coreutils diffutils nix-prefetch-github gnused jq ]; + binPath = lib.makeBinPath [ yarn2nix bundix coreutils diffutils nix-prefetch-git gnused jq ]; in runCommand "mastodon-update-script" { diff --git a/pkgs/servers/mastodon/update.sh b/pkgs/servers/mastodon/update.sh index 77071be6ea90..3a0686a72158 100755 --- a/pkgs/servers/mastodon/update.sh +++ b/pkgs/servers/mastodon/update.sh @@ -9,29 +9,29 @@ while [[ $# -gt 0 ]]; do case $key in --url) - URL="$2" - shift # past argument - shift # past value - ;; + URL="$2" + shift # past argument + shift # past value + ;; --ver) - VERSION="$2" - shift # past argument - shift # past value - ;; - --rev) - REVISION="$2" - shift # past argument - shift # past value - ;; - --patches) - PATCHES="$2" - shift # past argument - shift # past value - ;; - *) # unknown option - POSITIONAL+=("$1") - shift # past argument - ;; + VERSION="$2" + shift # past argument + shift # past value + ;; + --rev) + REVISION="$2" + shift # past argument + shift # past value + ;; + --patches) + PATCHES="$2" + shift # past argument + shift # past value + ;; + *) # unknown option + POSITIONAL+=("$1") + shift # past argument + ;; esac done