diff --git a/Slackware/i2p/doinst.sh b/Slackware/i2p/doinst.sh index 91dd097211..0f5c9f335b 100644 --- a/Slackware/i2p/doinst.sh +++ b/Slackware/i2p/doinst.sh @@ -49,16 +49,21 @@ echo echo "FINISHING I2P INSTALLATION. PLEASE WAIT." cd $INST_DIR -sh postinstall.sh || ( - echo "ERROR: failed execution of postinstall.sh. Please" - echo "cd into i2p installation directory and run " - echo "postinstall.sh manually with ./postinstall.sh" - exit 1 -) -sleep 10 -sh i2prouter stop || exit 1 + +OS_ARCH=`uname -m` +X86_64=`echo "$OS_ARCH" | grep x86_64` +if [ "X$X86_64" = "X" ]; then + wrapperpath="./lib/wrapper/linux" +else + wrapperpath="./lib/wrapper/linux64" +fi +cp $wrapperpath/libwrapper.so ./lib/ +cp $wrapperpath/wrapper.jar ./lib/ +cp $wrapperpath/i2psvc . +rm -rf ./lib/wrapper +chmod 744 ./i2psvc echo echo "Installation finished." diff --git a/Slackware/i2p/i2p.SlackBuild b/Slackware/i2p/i2p.SlackBuild index 3bb2c95033..f7ced54bfb 100755 --- a/Slackware/i2p/i2p.SlackBuild +++ b/Slackware/i2p/i2p.SlackBuild @@ -18,7 +18,7 @@ BUILD=1sim # put here installation dir, without first and last / -# es: usr/local +# eg: usr/local INSTALL_DIR=opt NAME=i2p ARCH=noarch @@ -64,7 +64,7 @@ mkdir -p $PKG cd $CWD/../../ ant distclean -ant dist +#ant dist ant tarball tar xjvf i2p.tar.bz2 -C $TMP @@ -76,6 +76,34 @@ mkdir -p $PKG/$INSTALL_DIR/ cp -a ../i2p $PKG/$INSTALL_DIR/ mkdir -p $PKG/install + +############################################################################# +# Preconfigureation to make package smaller +############################################################################# +cd $PKG/$INSTALL_DIR/i2p + +# wrapper.config $INSTALL_PATH and $SYSTEM_java_io_tmpdir +sed "s|\$INSTALL_PATH|$INSTALL_DIR/i2p|g" wrapper.config > a +sed "s|\$SYSTEM_java_io_tmpdir|/var/tmp|g" a > wrapper.config +# eepget %INSTALL_PATH +sed "s|\$INSTALL_PATH|$INSTALL_DIR/i2p|g" eepget > a +rm eepget +mv a eepget +# runplain.sh %INSTALL_PATH and %SYSTEM_java_io_tmpdir +sed "s|%INSTALL_PATH|$INSTALL_DIR/i2p|g" runplain.sh > a +sed "s|%SYSTEM_java_io_tmpdir|/var/tmp|g" a > runplain.sh +# i2prouter %INSTALL_PATH and %SYSTEM_java_io_tmpdir +sed "s|%INSTALL_PATH|$INSTALL_DIR/i2p|g" i2prouter > a +sed "s|%SYSTEM_java_io_tmpdir|/var/tmp|g" a > i2prouter + +chmod 744 ./i2prouter +chmod 744 ./osid +chmod 744 ./runplain.sh +chmod 744 ./eepget +chmod 744 ./scripts/i2pbench.sh +chmod 744 ./scripts/i2ptest.sh +rm -Rf ./lib/*.dll ./*.bat ./*.exe ./installer ./icons ./a postinstall.sh + mv $PKG/$INSTALL_DIR/i2p/*.config $PKG/install mv $PKG/$INSTALL_DIR/i2p/blocklist.txt $PKG/$INSTALL_DIR/i2p/blocklist.txt.new mv $PKG/$INSTALL_DIR/i2p/eepsite/jetty.xml $PKG/$INSTALL_DIR/i2p/eepsite/jetty.xml.new @@ -83,6 +111,7 @@ mv $PKG/$INSTALL_DIR/i2p/eepsite/docroot/index.html $PKG/$INSTALL_DIR/i2p/eepsit mv $PKG/$INSTALL_DIR/i2p/eepsite/docroot/favicon.ico $PKG/$INSTALL_DIR/i2p/eepsite/docroot/favicon.ico.new sed "s|directory|/$INSTALL_DIR/i2p/|g" $CWD/doinst.sh > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc + cd $PKG requiredbuilder -v -y -s $CWD $PKG makepkg -l y -c n $CWD/${NAME}-$VERSION-$ARCH-$BUILD.tgz diff --git a/history.txt b/history.txt index 25f62c6177..96015b69ae 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2009-07-15 sponge + * Slackware SlackBuild fixes. + 2009-07-14 dr|z3d * Increment to 0.7.5-10 * Tidy up layout of readme.* files. diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 1440f81c07..217d41d542 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 10; + public final static long BUILD = 11; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;