X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=makedist.sh;h=0441cfc8e874561c6d99d86911885b417e79605a;hb=16f6fd50b698cba058661ceba684237bd82229e4;hp=6618333c9a2c1faf138104e8bf72417ea06dd6b1;hpb=40a82883f6b7bba0011388e466abb8cff97e32fe;p=pyderasn.git

diff --git a/makedist.sh b/makedist.sh
index 6618333..0441cfc 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -6,15 +6,17 @@ release=$1
 [ -n "$release" ]
 
 mkdir $tmp/pyderasn-"$release"
-cut -d" " -f2 < MANIFEST.in > $tmp/includes
+cut -d" " -f2 < MANIFEST.in | while read path; do
+    find $path >> $tmp/includes
+done
 echo pyderasn.py >> $tmp/includes
 echo setup.py >> $tmp/includes
 tar cfI - $tmp/includes | tar xfC - $tmp/pyderasn-"$release"
 
 PYTHONPATH="$tmp/pyderasn-$release" make -C $tmp/pyderasn-"$release"/doc
 
-tar xvfC doc/download/six-*.tar.xz $tmp --include "*/six.py"
-mv -v $tmp/six-*/six.py $tmp/pyderasn-"$release"
+tar xvfC doc/download/six-*.tar.xz $tmp --include "*/*six.py"
+mv -v $tmp/six-*/*six.py $tmp/pyderasn-"$release"
 
 tar xvfC doc/download/termcolor-*.tar.xz $tmp --include "*/termcolor.py"
 mv -v $tmp/termcolor-*/termcolor.py $tmp/pyderasn-"$release"
@@ -25,7 +27,7 @@ xz -9v pyderasn-"$release".tar
 gpg --detach-sign --sign --local-user 04A933D1BA20327A pyderasn-"$release".tar.xz
 
 tarball=pyderasn-"$release".tar.xz
-size=$(( $(wc -c < $tarball) / 1024 ))
+size=$(( $(stat -f %z $tarball) / 1024 ))
 hash=$(gpg --print-md SHA256 < $tarball)
 release_date=$(date "+%Y-%m-%d")