public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nix-prefetch-zip: support single files and recuring directories

Browse Source 
See #5851
This commit is contained in:
Charles Strahan 2015-01-22 23:44:04 -05:00
parent 56c970ae01
commit 4a3e689519
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/build-support/fetchzip/nix-prefetch-zip
View File

@ -67,8 +67,12 @@ hashFormat="--base32"
tmp=$(mktemp -d 2>/dev/null || mktemp -d -t "$$") tmp=$(mktemp -d 2>/dev/null || mktemp -d -t "$$")
trap "rm -rf '$tmp'" EXIT trap "rm -rf '$tmp'" EXIT
unpackDirTmp=$tmp/unpacked-tmp/$name
mkdir -p $unpackDirTmp
unpackDir=$tmp/unpacked/$name unpackDir=$tmp/unpacked/$name
mkdir -p $unpackDir mkdir -p $unpackDir
downloadedFile=$tmp/$name downloadedFile=$tmp/$name
unpackFile() { unpackFile() {
@ -117,19 +121,27 @@ if test -z "$finalPath"; then
exit 1 exit 1
fi fi
cd $unpackDir
unpackFile "$downloadedFile"
# FIXME: handle zip files that contain a single regular file.
if [ -z "$leaveRoot" ]; then if [ -z "$leaveRoot" ]; then
shopt -s dotglob shopt -s dotglob
if [ $(ls -d $unpackDir/* | wc -l) != 1 ]; then
echo "error: zip file must contain a single directory." cd "$unpackDirTmp"
unpackFile "$downloadedFile"
if [ $(ls "$unpackDirTmp" | wc -l) != 1 ]; then
echo "error: zip file must contain a single file or directory."
exit 1 exit 1
fi fi
fn=$(cd "$unpackDir" && echo *)
mv $unpackDir/$fn/* "$unpackDir/" fn=$(cd "$unpackDirTmp" && echo *)
rmdir "$unpackDir/$fn"
if [ -f "$unpackDirTmp/$fn" ]; then
mv "$unpackDirTmp/$fn" "$unpackDir"
else
mv "$unpackDirTmp/$fn/"* "$unpackDir/"
fi
else
cd $unpackDir
unpackFile "$downloadedFile"
fi fi
# Compute the hash. # Compute the hash.