diff --git a/Slackware/i2p/doinst.sh b/Slackware/i2p/doinst.sh index 0f5c9f335b18d3b65e6456c8c8327c83629ab9c5..7838651a69ff2975e9df2fea24f8c1780c0ef803 100644 --- a/Slackware/i2p/doinst.sh +++ b/Slackware/i2p/doinst.sh @@ -7,7 +7,7 @@ INST_DIR=directory echo for i in *.config ; { if [ -f $INST_DIR/$i ] ; then - echo "Please check ${INST_DIR}${i}, as there is a new version." + echo "Please check ${INST_DIR}${i}, as there is new version." cp $i $INST_DIR/$i.new else cp $i $INST_DIR/$i @@ -26,9 +26,9 @@ for i in *.config ; { ( cd $INST_DIR/eepsite if [ -f jetty.xml ] ; then - rm jetty.xml.new + echo "Please check ${INST_DIR}/eepsite, as there are new files." else - mv jetty.xml.new jetty.xml + find $PKG/$INSTALL_DIR/i2p -name "*.xml.new" -exec sh -c 'mv "$0" "${0/.new}"' {} \; fi ) diff --git a/Slackware/i2p/i2p.SlackBuild b/Slackware/i2p/i2p.SlackBuild index 3ae2075c8cb3dd2392f00860efa93f05930b0a27..07c91659c0a72b78b5130a24ea3f4b07ebe6a5a6 100755 --- a/Slackware/i2p/i2p.SlackBuild +++ b/Slackware/i2p/i2p.SlackBuild @@ -18,6 +18,7 @@ # BUILD=1sponge +# INSTALL_DIR is referenced from /, don't prefix it with a '/' INSTALL_DIR=opt NAME=i2p ARCH=noarch @@ -104,7 +105,10 @@ 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|/$INSTALL_DIR/i2p|g" a > i2prouter +rm i2prouter +mv a i2prouter +sed "s|%SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" i2prouter > a +sed "s|#ALLOW_ROOT=true|ALLOW_ROOT=true|g" a > i2prouter chmod 744 ./i2prouter chmod 744 ./osid @@ -116,7 +120,7 @@ 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 +find $PKG/$INSTALL_DIR/i2p -name "*.xml" -exec mv {} {}.new \; mv $PKG/$INSTALL_DIR/i2p/eepsite/docroot/index.html $PKG/$INSTALL_DIR/i2p/eepsite/docroot/index.html.new 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 diff --git a/history.txt b/history.txt index 4de7ab7f422f352703ab8735a6179139cd0fe7fc..ad504ebbafa716f99332e356dff3fefd425ebb97 100644 --- a/history.txt +++ b/history.txt @@ -4,6 +4,9 @@ - Hide home page flags once language is selected - Home page shrinkage and other CSS tweaks +2012-03-11 sponge + * Slackware package script updates + 2012-03-11 zzz * Build: - Include old commons logging classes in commons-logging.jar