Cleaned up zip deletion code, better dist size output

bin/build-launcher.sh

@@ -36,19 +36,18 @@ cp $basedir/resources/launch.bat $basedir/dist/win/router/bin/
 for i in linux mac win; do cp -r $basedir/import/i2p.base $basedir/dist/$i/router/; done
 for i in linux mac win; do mkdir -p $basedir/dist/$i/router/i2p.config; done
 
-zip -d $basedir/dist/linux/router/i2p.base/jbigi.jar *-osx-*
+# remove unnecessary native libs from jbigi.jar
-zip -d $basedir/dist/linux/router/i2p.base/jbigi.jar *-windows-*
+for i in linux mac win; do
-zip -d $basedir/dist/linux/router/i2p.base/jbigi.jar *-freebsd-*
+  for j in freebsd linux mac win; do
-
+    if [ "$i" != "$j" ]; then
-zip -d $basedir/dist/mac/router/i2p.base/jbigi.jar *-linux-*
+      if [ "$j" = "mac" ]; then j="osx"; fi
-zip -d $basedir/dist/mac/router/i2p.base/jbigi.jar *-windows-*
+      if [ "$j" = "win" ]; then j="windows"; fi
-zip -d $basedir/dist/mac/router/i2p.base/jbigi.jar *-freebsd-*
+      zip -d $basedir/dist/$i/router/i2p.base/jbigi.jar *-${j}-*
-
+    fi
-zip -d $basedir/dist/win/router/i2p.base/jbigi.jar *-osx-*
+  done
-zip -d $basedir/dist/win/router/i2p.base/jbigi.jar *-linux-*
+done
-zip -d $basedir/dist/win/router/i2p.base/jbigi.jar *-freebsd-*
+
-
+du -sk dist/* | awk '{printf "%.1f MB %s\n",$1/1024,$2}'
-du -sh $basedir/dist/*
 
 echo "*** Done ***"
 echo "To run, type: dist/linux/router/bin/launch.sh"