diff options
Diffstat (limited to 'pkgs/build-support/fetchzip/default.nix')
| -rw-r--r-- | pkgs/build-support/fetchzip/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index 8605564fc1e..e980f9d6521 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -63,12 +63,12 @@ fetchurl (( chmod -R +w "$unpackDir" '' + (if stripRoot then '' - if [ $(ls "$unpackDir" | wc -l) != 1 ]; then + if [ $(ls -A "$unpackDir" | wc -l) != 1 ]; then echo "error: zip file must contain a single file or directory." echo "hint: Pass stripRoot=false; to fetchzip to assume flat list of files." exit 1 fi - fn=$(cd "$unpackDir" && echo *) + fn=$(cd "$unpackDir" && ls -A) if [ -f "$unpackDir/$fn" ]; then mkdir $out fi |