X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=keyanalyze%2Fanalyze.sh;h=ae1d90dbcf477e6a36f28e85c23f3b932b8adee8;hb=832935452b272802a9b480aee2ea7013056993d2;hp=b70d14b873a891c41f6d88ba15f4a956de197c15;hpb=e69aea6f5797cb54f3748b983ffc977958f347cc;p=pgp-tools.git

diff --git a/keyanalyze/analyze.sh b/keyanalyze/analyze.sh
index b70d14b..ae1d90d 100755
--- a/keyanalyze/analyze.sh
+++ b/keyanalyze/analyze.sh
@@ -5,11 +5,7 @@ make
 
 # comment these next lines out if you are working with an existing
 # preprocess.keys file
-pgpring -S -k $1							\
-	| grep "\(pub\|sig\|rev\|uid\)"					\
-	| sed -e "s/^\([a-z]*\).*:\([0-9A-F]\{16\}\):.*/\1 \2/g"	\
-		-e "s/^uid:.*/uid/"	> all.keys
-cat all.keys | process_keys $2 > preprocess.keys
+pgpring -S -k "$1" | process_keys $2 > preprocess.keys
 
 # the actual processing of the main report
 keyanalyze
@@ -17,10 +13,10 @@ keyanalyze
 # html beautification and reports and such
 # comment this out if you don't want all the stuff in the report
 # at http://dtype.org/keyanalyze/
-cat output/msd.txt | sort -n -k 3 | nl -s ' ' > output/msd-sorted.txt
-head -n 50 output/msd-sorted.txt | scripts/top50.pl > output/top50table.html
+cat output/msd.txt | sort -k 3 | nl -s ' ' > output/msd-sorted.txt
+cat output/msd.txt | scripts/top50.pl > output/top50table.html
 cat scripts/report_top.php output/top50table.html \
 	scripts/report_bottom.php > output/report.php
-head -n 1000 output/msd-sorted.txt | scripts/top50.pl > output/top1000table.html
+cat output/msd.txt | scripts/top50.pl -n 1000 > output/top1000table.html
 cat scripts/1000_top.php output/top1000table.html \
 	scripts/1000_bottom.php > output/report_1000.php