diff --git a/Slackware/i2p/doinst.sh b/Slackware/i2p/doinst.sh index 91dd09721..0f5c9f335 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 3bb2c9503..f7ced54bf 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/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java index 48bb984b6..53ed82749 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java @@ -84,6 +84,7 @@ public class IndexBean { static final String CLIENT_NICKNAME = "shared clients"; public static final String PROP_THEME_NAME = "routerconsole.theme"; + public static final String DEFAULT_THEME = "light"; public static final String PROP_CSS_DISABLED = "routerconsole.css.disabled"; public static final String PROP_JS_DISABLED = "routerconsole.javascript.disabled"; @@ -319,11 +320,8 @@ public class IndexBean { //// public String getTheme() { - String theme = _context.getProperty(PROP_THEME_NAME); - if (theme != null) - return "/themes/console/" + theme + "/"; - else - return "/themes/console/"; + String theme = _context.getProperty(PROP_THEME_NAME, DEFAULT_THEME); + return "/themes/console/" + theme + "/"; } public boolean allowCSS() { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java index 6b3916883..a2f3341f9 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java @@ -8,6 +8,7 @@ public class CSSHelper extends HelperBase { public CSSHelper() {} public static final String PROP_THEME_NAME = "routerconsole.theme"; + public static final String DEFAULT_THEME = "light"; private static final String BASE = "/themes/console/"; private static final String FORCE = "classic"; @@ -16,9 +17,8 @@ public class CSSHelper extends HelperBase { if (userAgent != null && userAgent.contains("MSIE")) { url += FORCE + "/"; } else { - String theme = _context.getProperty(PROP_THEME_NAME); - if (theme != null) - url += theme + "/"; + String theme = _context.getProperty(PROP_THEME_NAME, DEFAULT_THEME); + url += theme + "/"; } return url; } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java index 0e0b36a28..9bfd22077 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java @@ -3,12 +3,11 @@ package net.i2p.router.web; public class ConfigUIHelper extends HelperBase { public ConfigUIHelper() {} - public static final String PROP_THEME = "routerconsole.theme"; private static final String themes[] = {"classic", "dark", "light"}; public String getSettings() { StringBuilder buf = new StringBuilder(512); - String current = _context.getProperty(PROP_THEME, "default"); + String current = _context.getProperty(CSSHelper.PROP_THEME_NAME, CSSHelper.DEFAULT_THEME); for (String theme : themes) { buf.append(" + @@ -94,6 +95,7 @@ + diff --git a/installer/resources/postinstall.sh b/installer/resources/postinstall.sh index d273d226e..72daee17f 100644 --- a/installer/resources/postinstall.sh +++ b/installer/resources/postinstall.sh @@ -74,6 +74,7 @@ rm -f ./lib/*.dll rm -f ./*.bat rm -f ./*.exe rm -rf ./installer -./i2prouter start +# no, let's not start the router from the install script any more +# ./i2prouter start exit 0 diff --git a/installer/resources/start-i2p.txt b/installer/resources/start-i2p.txt new file mode 100644 index 000000000..9da29e394 --- /dev/null +++ b/installer/resources/start-i2p.txt @@ -0,0 +1 @@ +To start I2P, run "$INSTALL_PATH/i2prouter start" diff --git a/readme_zh.html b/readme_zh.html index bb7dc314a..7e6d509ef 100644 --- a/readme_zh.html +++ b/readme_zh.html @@ -1,26 +1,26 @@

English | Deutsch | Français | Nederlands | Svenska

-

如果 I2P 已经运行，未来的几分钟里控制台左侧的活动节点(Active)数量将开始增长，并会出现名为 "已共享客户"("shared clients") 的本地目标。(如果没有,请见 疑难解答)。待出现以上消息后，您可以:

+

濡傛灉 I2P 宸茬粡杩愯锛屾湭鏉ョ殑鍑犲垎閽熼噷鎺у埗鍙板乏渚х殑娲诲姩鑺傜偣(Active)鏁伴噺灏嗗紑濮嬪闀匡紝骞朵細鍑虹幇鍚嶄负 "宸插叡浜鎴"("shared clients") 鐨勬湰鍦扮洰鏍囥(濡傛灉娌℃湁,璇疯 鐤戦毦瑙ｇ瓟)銆傚緟鍑虹幇浠ヤ笂娑堟伅鍚庯紝鎮ㄥ彲浠:

-

想创建属于您自己的 IIP 站点(EEPSITE)？

+

鎯冲垱寤哄睘浜庢偍鑷繁鐨 IIP 绔欑偣(EEPSITE)锛

-

我们已经集成了一些软件来帮助你运行自己的EEPSITE - 有一个Jetty 实例监听于本机 http://localhost:7658/上。只要将你的文件放在 eepsite/docroot/ 文件夹中 (或将任何标准的 JSP/Servlet .war 文件放置于 eepsite/webapps 中, 标准的 CGI 脚本应置于 eepsite/cgi-bin 目录内) 之后就可以浏览啦。此后运行 IIP站点隧道(EEPSITE TUNEL) 将其指向站点的端口, 您的站点就可以被他人看到了。当您创建IIP站点时的具体操作参见 您的临时EEPSITE页面。

+

鎴戜滑宸茬粡闆嗘垚浜嗕竴浜涜蒋浠舵潵甯姪浣犺繍琛岃嚜宸辩殑EEPSITE - 鏈変竴涓Jetty 瀹炰緥鐩戝惉浜庢湰鏈 http://localhost:7658/涓娿傚彧瑕佸皢浣犵殑鏂囦欢鏀惧湪 eepsite/docroot/ 鏂囦欢澶逛腑 (鎴栧皢浠讳綍鏍囧噯鐨 JSP/Servlet .war 鏂囦欢鏀剧疆浜 eepsite/webapps 涓, 鏍囧噯鐨 CGI 鑴氭湰搴旂疆浜 eepsite/cgi-bin 鐩綍鍐) 涔嬪悗灏卞彲浠ユ祻瑙堝暒銆傛鍚庤繍琛 IIP绔欑偣闅ч亾(EEPSITE TUNEL) 灏嗗叾鎸囧悜绔欑偣鐨勭鍙, 鎮ㄧ殑绔欑偣灏卞彲浠ヨ浠栦汉鐪嬪埌浜嗐傚綋鎮ㄥ垱寤篒IP绔欑偣鏃剁殑鍏蜂綋鎿嶄綔鍙傝 鎮ㄧ殑涓存椂EEPSITE椤甸潰銆

-

疑难解答

+

鐤戦毦瑙ｇ瓟

-

保持耐心 - I2P 第一次启动时需要搜索节点，可能比较缓慢。如果30分钟后，您的活动节点(Active:已连接/新近连接) 计数仍在 10 个节点以下, 请在防火墙中打开 8887 端口改善连接性能。如果您根本无法打开任何EEPSITE(甚至 www.i2p2.i2p)，检查您的浏览器代理设置是否为本地的 localhost:4444。你也可以查看 I2P 网站 上的信息, 在 I2P 论坛 中发帖, 来 irc.freenode.net , irc.postman.i2p 或 irc.freshcoffee.i2p 上的 #i2p 或 #i2p-chat 两个IRC频道坐坐。 (这些服务器上的这两个频道是相通的)。

+

淇濇寔鑰愬績 - I2P 绗竴娆″惎鍔ㄦ椂闇瑕佹悳绱㈣妭鐐癸紝鍙兘姣旇緝缂撴參銆傚鏋30鍒嗛挓鍚庯紝鎮ㄧ殑娲诲姩鑺傜偣(Active:宸茶繛鎺/鏂拌繎杩炴帴) 璁℃暟浠嶅湪 10 涓妭鐐逛互涓, 璇峰湪闃茬伀澧欎腑鎵撳紑 8887 绔彛鏀瑰杽杩炴帴鎬ц兘銆傚鏋滄偍鏍规湰鏃犳硶鎵撳紑浠讳綍EEPSITE(鐢氳嚦 www.i2p2.i2p)锛屾鏌ユ偍鐨勬祻瑙堝櫒浠ｇ悊璁剧疆鏄惁涓烘湰鍦扮殑 localhost:4444銆備綘涔熷彲浠ユ煡鐪 I2P 缃戠珯 涓婄殑淇℃伅, 鍦 I2P 璁哄潧 涓彂甯, 鏉 irc.freenode.net , irc.postman.i2p 鎴 irc.freshcoffee.i2p 涓婄殑 #i2p 鎴 #i2p-chat 涓や釜IRC棰戦亾鍧愬潗銆 (杩欎簺鏈嶅姟鍣ㄤ笂鐨勮繖涓や釜棰戦亾鏄浉閫氱殑)銆

diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 1440f81c0..3e5e8985d 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 = 12; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;