0.6

Disable pack200
Update makeplugin.sh script

CHANGES.txt

@@ -1,3 +1,6 @@
+* 2020-06-08 0.6
+  - Disable pack200
+
 * 2020-05-31 0.5
   - Remove bundled libjson-simple which conflicts with i2p.jar
   - Switch to use libjson-simple 2.x API in i2p.jar

build.xml

@@ -11,7 +11,7 @@
     <target name="plugin" depends="war"> 
         <!-- get version number -->
         <buildnumber file="scripts/build.number" />
-        <property name="release.number" value="0.5" />
+        <property name="release.number" value="0.6" />
 
         <!-- we don't bother with an update plugin, everything is in a single war -->
         <copy file="LICENSE.txt" todir="plugin/" overwrite="true" />
@@ -21,8 +21,8 @@
             <arg value="version=${release.number}-b${build.number}" />
         </exec>
         <exec executable="pack200" failonerror="true">
-            <arg value="-g" />
-            <arg value="plugin/console/webapps/transmission.war.pack" />
+            <arg value="-r" />
+            <arg value="plugin/console/webapps/transmission.war" />
             <arg value="src/build/transmission.war.jar" />
         </exec>
         <input message="Enter su3 signing key password:" addproperty="release.password.su3" />
@@ -47,7 +47,7 @@
     <target name="clean" >
         <ant dir="src" target="clean" />
         <delete file="plugin/plugin.config" />
-        <delete file="plugin/console/webapps/transmission.war.pack" />
+        <delete file="plugin/console/webapps/transmission.war" />
         <delete file="plugin/LICENSE.txt" />
         <delete file="plugin/README.txt" />
         <delete file="plugin.zip" />

scripts/makeplugin.sh

@@ -7,6 +7,17 @@
 #  zzz 2010-02
 #  zzz 2014-08 added support for su3 files
 #
+
+if [ -z "$I2P" -a -d "$PWD/../i2p/pkg-temp" ]; then
+	export I2P=$PWD/../i2p/pkg-temp
+fi
+
+if [ ! -d "$I2P" ]; then
+	echo "Can't locate your I2P installation. Please add a environment variable named I2P with the path to the folder as value"
+	echo "On OSX this solved with running: export I2P=/Applications/i2p if default install directory is used."
+	exit 1
+fi
+
 CPATH=$I2P/lib/i2p.jar:/usr/share/java/gnu-getopt.jar
 PUBKEYDIR=$HOME/.i2p-plugin-keys
 PUBKEYFILE=$PUBKEYDIR/plugin-public-signing.key
@@ -22,53 +33,53 @@ PLUGINDIR=${1:-plugin}
 PC=plugin.config
 PCT=${PC}.tmp
 
-if [ ! -d $PLUGINDIR ]
+if [ ! -d "$PLUGINDIR" ]
 then
 	echo "You must have a $PLUGINDIR directory"
 	exit 1
 fi
 
-if [ ! -f $PLUGINDIR/$PC ]
+if [ ! -f "$PLUGINDIR/$PC" ]
 then
 	echo "You must have a $PLUGINDIR/$PC file"
 	exit 1
 fi
 
-SIGNER=`grep '^signer=' $PLUGINDIR/$PC`
+SIGNER=`grep '^signer=' "$PLUGINDIR/$PC"`
 if [ "$?" -ne "0" ]
 then
 	echo "You must have a signer name in $PC"
-	echo 'For example name=foo'
+	echo 'For example signer=foo'
 	exit 1
 fi
 SIGNER=`echo $SIGNER | cut -f 2 -d '='`
 
-if [ ! -f $PRIVKEYFILE ]
+if [ ! -f "$PRIVKEYFILE" ]
 then
 	echo "Creating new XPI2P DSA keys"
-	mkdir -p $PUBKEYDIR || exit 1
-	java -cp $CPATH net.i2p.crypto.TrustedUpdate keygen $PUBKEYFILE $PRIVKEYFILE || exit 1
-	java -cp $CPATH net.i2p.data.Base64 encode $PUBKEYFILE $B64KEYFILE || exit 1
+	mkdir -p "$PUBKEYDIR" || exit 1
+	java -cp "$CPATH" net.i2p.crypto.TrustedUpdate keygen "$PUBKEYFILE" "$PRIVKEYFILE" || exit 1
+	java -cp "$CPATH" net.i2p.data.Base64 encode "$PUBKEYFILE" "$B64KEYFILE" || exit 1
 	rm -rf logs/
-	chmod 444 $PUBKEYFILE $B64KEYFILE
-	chmod 400 $PRIVKEYFILE
+	chmod 444 "$PUBKEYFILE" "$B64KEYFILE"
+	chmod 400 "$PRIVKEYFILE"
 	echo "Created new XPI2P keys: $PUBKEYFILE $PRIVKEYFILE"
 fi
 
-if [ ! -f $PRIVKEYSTORE ]
+if [ ! -f "$PRIVKEYSTORE" ]
 then
 	echo "Creating new SU3 $KEYTYPE keys for $SIGNER"
-	java -cp $CPATH net.i2p.crypto.SU3File keygen -t $KEYTYPE $PUBKEYSTORE $PRIVKEYSTORE $SIGNER || exit 1
+	java -cp "$CPATH" net.i2p.crypto.SU3File keygen -t $KEYTYPE "$PUBKEYSTORE" "$PRIVKEYSTORE" $SIGNER || exit 1
 	echo '*** Save your password in a safe place!!! ***'
 	rm -rf logs/
 	# copy to the router dir so verify will work
         CDIR=$I2P/certificates/plugin
-	mkdir -p $CDIR || exit 1
+	mkdir -p "$CDIR" || exit 1
 	CFILE=$CDIR/`echo $SIGNER | sed s/@/_at_/`.crt
-	cp $PUBKEYSTORE $CFILE
-	chmod 444 $PUBKEYSTORE
-	chmod 400 $PRIVKEYSTORE
-	chmod 644 $CFILE
+	cp "$PUBKEYSTORE" "$CFILE"
+	chmod 444 "$PUBKEYSTORE"
+	chmod 400 "$PRIVKEYSTORE"
+	chmod 644 "$CFILE"
 	echo "Created new SU3 keys: $PUBKEYSTORE $PRIVKEYSTORE"
 	echo "Copied public key to $CFILE for testing"
 fi
@@ -76,7 +87,7 @@ fi
 rm -f plugin.zip
 
 OPWD=$PWD
-cd $PLUGINDIR
+cd "$PLUGINDIR"
 
 grep -q '^name=' $PC
 if [ "$?" -ne "0" ]
@@ -102,12 +113,12 @@ mv $PCT $PC || exit 1
 
 # add our Base64 key
 grep -v '^key=' $PC > $PCT
-B64KEY=`cat $B64KEYFILE`
+B64KEY=`cat "$B64KEYFILE"`
 echo "key=$B64KEY" >> $PCT || exit 1
 mv $PCT $PC || exit 1
 
 # zip it
-zip -r $OPWD/plugin.zip * || exit 1
+zip -r "$OPWD/plugin.zip" * || exit 1
 
 # get the version and use it for the sud header
 VERSION=`grep '^version=' $PC | cut -f 2 -d '='`
@@ -115,24 +126,24 @@ VERSION=`grep '^version=' $PC | cut -f 2 -d '='`
 NAME=`grep '^name=' $PC | cut -f 2 -d '='`
 XPI2P=${NAME}.xpi2p
 SU3=${NAME}.su3
-cd $OPWD
+cd "$OPWD"
 
 # sign it
 echo 'Signing. ...'
-java -cp $CPATH net.i2p.crypto.TrustedUpdate sign plugin.zip $XPI2P $PRIVKEYFILE $VERSION || exit 1
-java -cp $CPATH net.i2p.crypto.SU3File sign -c PLUGIN -t $KEYTYPE plugin.zip $SU3 $PRIVKEYSTORE $VERSION $SIGNER || exit 1
+java -cp "$CPATH" net.i2p.crypto.TrustedUpdate sign plugin.zip "$XPI2P" "$PRIVKEYFILE" "$VERSION" || exit 1
+java -cp "$CPATH" net.i2p.crypto.SU3File sign -c PLUGIN -t $KEYTYPE plugin.zip "$SU3" "$PRIVKEYSTORE" "$VERSION" "$SIGNER" || exit 1
 rm -f plugin.zip
 
 # verify
 echo 'Verifying. ...'
-java -cp $CPATH net.i2p.crypto.TrustedUpdate showversion $XPI2P || exit 1
-java -cp $CPATH -Drouter.trustedUpdateKeys=$B64KEY net.i2p.crypto.TrustedUpdate verifysig $XPI2P || exit 1
-java -cp $CPATH net.i2p.crypto.SU3File showversion $SU3 || exit 1
-java -cp $CPATH net.i2p.crypto.SU3File verifysig -k $PUBKEYSTORE $SU3 || exit 1
+java -cp "$CPATH" net.i2p.crypto.TrustedUpdate showversion "$XPI2P" || exit 1
+java -cp "$CPATH" -Drouter.trustedUpdateKeys=$B64KEY net.i2p.crypto.TrustedUpdate verifysig "$XPI2P" || exit 1
+java -cp "$CPATH" net.i2p.crypto.SU3File showversion "$SU3" || exit 1
+java -cp "$CPATH" net.i2p.crypto.SU3File verifysig -k "$PUBKEYSTORE" "$SU3" || exit 1
 rm -rf logs/
 
 echo 'Plugin files created: '
-wc -c $XPI2P
-wc -c $SU3
+wc -c "$XPI2P"
+wc -c "$SU3"
 
 exit 0