diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-10 20:06:14 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-10 20:06:50 +0100 |
| commit | 0a9ec07b93f762ac1284bab48ff1292bba657981 (patch) | |
| tree | 3f01a907b9701cb535a8348a768e5c7a12601708 /pkgs/build-support/release | |
| parent | a767210542aeb85fc792ea5fec7d14b21ef56a51 (diff) | |
| download | nixpkgs-0a9ec07b93f762ac1284bab48ff1292bba657981.tar nixpkgs-0a9ec07b93f762ac1284bab48ff1292bba657981.tar.gz nixpkgs-0a9ec07b93f762ac1284bab48ff1292bba657981.tar.bz2 nixpkgs-0a9ec07b93f762ac1284bab48ff1292bba657981.tar.lz nixpkgs-0a9ec07b93f762ac1284bab48ff1292bba657981.tar.xz nixpkgs-0a9ec07b93f762ac1284bab48ff1292bba657981.tar.zst nixpkgs-0a9ec07b93f762ac1284bab48ff1292bba657981.zip | |
findTarball: Fix the case where src is a directory
Diffstat (limited to 'pkgs/build-support/release')
| -rw-r--r-- | pkgs/build-support/release/functions.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/build-support/release/functions.sh b/pkgs/build-support/release/functions.sh index 40bb32fab4e..d3be4084e4f 100644 --- a/pkgs/build-support/release/functions.sh +++ b/pkgs/build-support/release/functions.sh @@ -1,16 +1,14 @@ findTarball() { local suffix i - if [ -f "$1" ]; then - echo "$1" - return - fi if [ -d "$1/tarballs/" ]; then for suffix in tar.gz tgz tar.bz2 tbz2 tar.xz tar.lzma; do for i in $1/tarballs/*.$suffix; do echo $i; return; done done | sort | head -1 return + else + echo "$1" + return fi - return 1 } canonicalizeJarManifest() { |