# HG changeset patch # User Christophe Lincoln # Date 1306536061 -7200 # Node ID e35efad312d1a767121705edc75ac79406fb56f4 # Parent 7484825355cc2e44f2e9a6e4c80360070dcab5fb cook: improve source extracting, may be one file (Thanks Godane) diff -r 7484825355cc -r e35efad312d1 cook --- a/cook Fri May 27 19:18:56 2011 +0100 +++ b/cook Sat May 28 00:41:01 2011 +0200 @@ -565,7 +565,9 @@ cd $pkgdir/source/tmp # Some archives are not well done and don't extract to one dir (ex lzma). files=$(ls | wc -l) - [ "$files" == 1 ] && mv * ../$PACKAGE-$VERSION + [ "$files" == 1 ] && [ -d "$(ls)" ] && mv * ../$PACKAGE-$VERSION + [ "$files" == 1 ] && [ -f "$(ls)" ] && mkdir -p ../$PACKAGE-$VERSION && \ + mv * ../$PACKAGE-$VERSION/$TARBALL [ "$files" -gt 1 ] && mkdir -p ../$PACKAGE-$VERSION && \ mv * ../$PACKAGE-$VERSION cd .. && rm -rf tmp