X-Git-Url: http://www.git.cypherpunks.ru/?p=pyderasn.git;a=blobdiff_plain;f=makedist.sh;h=aaf7fb9357600225d0459185368d701cfad4ebf1;hp=67fe6033f75c3bd86b6010ea03a9f5f82c16dce0;hb=b54295efb44566cd7eb6b09a4d5366f82cb96441;hpb=a53922e56add84b7faf8b4ea6194406c5eedbc48

diff --git a/makedist.sh b/makedist.sh
index 67fe603..aaf7fb9 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -6,29 +6,23 @@ release=$1
 [ -n "$release" ]
 
 mkdir $tmp/pyderasn-"$release"
-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"
+{
+    echo pyderasn.py
+    echo setup.py
+    find $(perl -lane 'print $F[1]' MANIFEST.in)
+} | tar cfI - - | tar xfC - $tmp/pyderasn-"$release"
 
 PYTHONPATH="$tmp/pyderasn-$release" redo $tmp/pyderasn-"$release"/doc/build.log
 rm -r $tmp/pyderasn-"$release"/doc/.redo $tmp/pyderasn-"$release"/doc/build.log
 
-tar xvfC doc/download/six-1.16.0.tar.gz $tmp --include "*/*six.py"
-mv -v $tmp/six-*/six.py $tmp/pyderasn-"$release"
-mv -v $tmp/six-*/test_six.py $tmp/pyderasn-"$release"/tests
-
 tar xvfC doc/download/termcolor-1.1.0.tar.gz $tmp --include "*/termcolor.py"
 mv -v $tmp/termcolor-*/termcolor.py $tmp/pyderasn-"$release"
 
 pip_hash=$(pip hash dist/pyderasn-"$release".tar.gz | sed -n '$p')
-six_requirement="six==1.16.0 --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"
 
 cd $tmp
-find . -type d -exec chmod 755 {} \;
-find . -type f -exec chmod 644 {} \;
+find . -type d -exec chmod 755 {} +
+find . -type f -exec chmod 644 {} +
 chmod 755 pyderasn-"$release"/pyderasn.py
 tar cvf pyderasn-"$release".tar --uid=0 --gid=0 --numeric-owner pyderasn-"$release"
 zstd -19 -v pyderasn-"$release".tar
@@ -49,7 +43,6 @@ An entry for documentation:
      - \`\`$hash\`\`
 
 pyderasn==$release $pip_hash
-$six_requirement
 EOF
 
 mv $tmp/$tarball $tmp/"$tarball".sig $cur/doc/download
@@ -82,7 +75,6 @@ GPG key: 2ED6 C846 3051 02DF 5B4E  0383 04A9 33D1 BA20 327A
 pip'es requirements file:
 
     pyderasn==$release $pip_hash
-    $six_requirement
 
 Please send questions regarding the use of PyDERASN, bug reports and patches
 to mailing list: http://lists.cypherpunks.ru/pyderasn_002ddevel.html