diff --git a/Slackware/i2p/i2p.SlackBuild b/Slackware/i2p/i2p.SlackBuild index fc95ce3791..3ae2075c8c 100755 --- a/Slackware/i2p/i2p.SlackBuild +++ b/Slackware/i2p/i2p.SlackBuild @@ -85,23 +85,26 @@ cp -a ../i2p $PKG/$INSTALL_DIR/ mkdir -p $PKG/install ############################################################################# -# Preconfigureation to make package smaller +# Preconfigureation to make package smaller, and... +# we keep as much as reasonable in the installation directory. +# This makes the install map fairly well to the standard installation. +# It also makes it easier to find the log and pid files! ############################################################################# 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 +sed "s|\$INSTALL_PATH|/$INSTALL_DIR/i2p|g" wrapper.config > a +sed "s|\$SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" a > wrapper.config # eepget %INSTALL_PATH -sed "s|\$INSTALL_PATH|$INSTALL_DIR/i2p|g" eepget > a +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 +sed "s|%INSTALL_PATH|/$INSTALL_DIR/i2p|g" runplain.sh > a +sed "s|%SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|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 +sed "s|%INSTALL_PATH|/$INSTALL_DIR/i2p|g" i2prouter > a +sed "s|%SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" a > i2prouter chmod 744 ./i2prouter chmod 744 ./osid diff --git a/history.txt b/history.txt index af4b19410f..90664730b1 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2010-10-22 sponge + * Sanity and some fixs for slackware package + 2010-10-22 sponge * Fix rc.i2p for slackware package diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 4f6b6353ed..df69e964f9 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 = 04; + public final static long BUILD = 05; /** for example "-test" */ public final static String EXTRA = "";