fetchzip, fetchgit: cleanup handling of optional features and whitespace

No intended functional difference, just trying to polish to make this easier to
extend and more aligned with other nix conventions.
This commit is contained in:
Benjamin Hipple
2020-02-02 16:56:11 -05:00
parent 8396961c9c
commit caff183402
3 changed files with 41 additions and 43 deletions

View File

@@ -1,4 +1,4 @@
{stdenvNoCC, git, cacert}: let
{ stdenvNoCC, git, cacert }: let
urlToName = url: rev: let
inherit (stdenvNoCC.lib) removeSuffix splitString last;
base = last (splitString ":" (baseNameOf (removeSuffix "/" url)));

View File

@@ -1,6 +1,5 @@
#! /usr/bin/env bash
set -e -o pipefail
#!/usr/bin/env bash
set -eo pipefail
url=
rev=
@@ -38,17 +37,17 @@ usage(){
echo >&2 "syntax: nix-prefetch-git [options] [URL [REVISION [EXPECTED-HASH]]]
Options:
--out path Path where the output would be stored.
--url url Any url understood by 'git clone'.
--rev ref Any sha1 or references (such as refs/heads/master)
--hash h Expected hash.
--branch-name Branch name to check out into
--deepClone Clone the entire repository.
--no-deepClone Make a shallow clone of just the required ref.
--leave-dotGit Keep the .git directories.
--out path Path where the output would be stored.
--url url Any url understood by 'git clone'.
--rev ref Any sha1 or references (such as refs/heads/master).
--hash h Expected hash.
--branch-name Branch name to check out into.
--deepClone Clone the entire repository.
--no-deepClone Make a shallow clone of just the required ref.
--leave-dotGit Keep the .git directories.
--fetch-submodules Fetch submodules.
--builder Clone as fetchgit does, but url, rev, and out option are mandatory.
--quiet Only print the final json summary.
--builder Clone as fetchgit does, but url, rev, and out option are mandatory.
--quiet Only print the final json summary.
"
exit 1
}