compare-to-official-release checks the AAR now

But really, this should all be ported to diffoscope...

compare-to-official-release

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ $# -ne 2 ]; then
-    echo "Usage: $0 IOCipher-v0.3.zip ~/Downloads/IOCipher-v0.3.zip"
+    echo "Usage: $0 IOCipher-v0.3.aar ~/Downloads/IOCipher-v0.3.aar"
     exit 1
 fi
 
@@ -12,55 +12,47 @@ test -e "$1"
 test -e "$2"
 
 tmpdir=`mktemp -d /tmp/.compare-zips.XXXXXXXXXX`
-zip1=$(basename $1)
-zip2=$(basename $2)
+aar1=$(basename $1)
+aar2=$(basename $2)
 sourcedir1=$(cd `dirname $1` && pwd)
 sourcedir2=$(cd `dirname $2` && pwd)
-zipname1=`echo $zip1 | sed 's,\.zip$,,'`
-zipname2=`echo $zip2 | sed 's,\.zip$,,'`
+zipname1=`echo $aar1 | sed 's,\.aar$,,'`
+zipname2=`echo $aar2 | sed 's,\.aar$,,'`
 dir1=$tmpdir/`echo $(dirname $1) | sed 's,[/ ],_,g'`-$zipname1
 dir2=$tmpdir/`echo $(dirname $2) | sed 's,[/ ],_,g'`-$zipname2
-jar1=$dir1/$zipname1*.jar
-jar2=$dir2/$zipname2*.jar
-jarname1=`basename $jar1 | sed 's,\*\.jar$,,'`
-jarname2=`basename $jar2 | sed 's,\*\.jar$,,'`
-jardir1=$dir1/$jarname1
-jardir2=$dir2/$jarname2
 
 mkdir -p $dir1
 cd $dir1
-unzip "$sourcedir1/$zip1"
+unzip "$sourcedir1/$aar1"
 # ignore the file path in the sum
-md5sum "$sourcedir1/$zip1" | cut -d ' ' -f 1 > md5sum
-sha1sum "$sourcedir1/$zip1" | cut -d ' ' -f 1 > sha1sum
-sha256sum "$sourcedir1/$zip1" | cut -d ' ' -f 1 > sha256sum
+md5sum "$sourcedir1/$aar1" | cut -d ' ' -f 1 > md5sum
+sha1sum "$sourcedir1/$aar1" | cut -d ' ' -f 1 > sha1sum
+sha256sum "$sourcedir1/$aar1" | cut -d ' ' -f 1 > sha256sum
 # strip the full path to the zip for the comparison
-unzip -l "$sourcedir1/$zip1" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/unzip-l.txt
-unzip -lv "$sourcedir1/$zip1" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/unzip-lv.txt
-zipinfo -lv "$sourcedir1/$zip1" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/zipinfo-lv.txt
-hexdump -C "$sourcedir1/$zip1" > $dir1/xxd
-mkdir $jardir1
-unzip -d $jardir1 $jar1
-unzip -l "$jar1" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/unzip-l.txt
-unzip -lv "$jar1" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/unzip-lv.txt
-zipinfo -lv "$jar1" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/zipinfo-lv.txt
+unzip -l "$sourcedir1/$aar1" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/unzip-l.txt
+unzip -lv "$sourcedir1/$aar1" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/unzip-lv.txt
+zipinfo -lv "$sourcedir1/$aar1" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/zipinfo-lv.txt
+hexdump -C "$sourcedir1/$aar1" > $dir1/xxd
+unzip $dir1/classes.jar
+unzip -l $dir1/classes.jar | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/unzip-l.txt
+unzip -lv $dir1/classes.jar | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/unzip-lv.txt
+zipinfo -lv $dir1/classes.jar | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/zipinfo-lv.txt
 
 mkdir -p $dir2
 cd $dir2
-unzip "$sourcedir2/$zip2"
-md5sum "$sourcedir2/$zip2" | cut -d ' ' -f 1 > md5sum
-sha1sum "$sourcedir2/$zip2" | cut -d ' ' -f 1 > sha1sum
-sha256sum "$sourcedir2/$zip2" | cut -d ' ' -f 1 > sha256sum
+unzip "$sourcedir2/$aar2"
+md5sum "$sourcedir2/$aar2" | cut -d ' ' -f 1 > md5sum
+sha1sum "$sourcedir2/$aar2" | cut -d ' ' -f 1 > sha1sum
+sha256sum "$sourcedir2/$aar2" | cut -d ' ' -f 1 > sha256sum
 # strip the full path to the zip for the comparison
-unzip -l "$sourcedir2/$zip2" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/unzip-l.txt
-unzip -lv "$sourcedir2/$zip2" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/unzip-lv.txt
-zipinfo -lv "$sourcedir2/$zip2" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/zipinfo-lv.txt
-hexdump -C "$sourcedir2/$zip2" > $dir2/xxd
-mkdir $jardir2
-unzip -d $jardir2 $jar2
-unzip -l "$jar2" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/unzip-l.txt
-unzip -lv "$jar2" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/unzip-lv.txt
-zipinfo -lv "$jar2" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/zipinfo-lv.txt
+unzip -l "$sourcedir2/$aar2" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/unzip-l.txt
+unzip -lv "$sourcedir2/$aar2" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/unzip-lv.txt
+zipinfo -lv "$sourcedir2/$aar2" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/zipinfo-lv.txt
+hexdump -C "$sourcedir2/$aar2" > $dir2/xxd
+unzip $dir2/classes.jar
+unzip -l $dir2/classes.jar | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/unzip-l.txt
+unzip -lv $dir2/classes.jar | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/unzip-lv.txt
+zipinfo -lv $dir2/classes.jar | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/zipinfo-lv.txt
 
 if which meld > /dev/null; then
     meld $dir1 $dir2