From 2f10cca40fc9a63c6563c623e03ea91b8a3d8a16 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 26 Jun 2011 19:07:01 +0000 Subject: [PATCH] * Fixes after review: - Fix Polish po file - Install as a service by default on Windows again - Change CPUID getters to package private - Split new jbigi install messages into two lines - Javadocs --- .../java/src/net/i2p/addressbook/Daemon.java | 1 - .../i2p/i2ptunnel/I2PTunnelHTTPClient.java | 4 ++ .../src/net/i2p/client/streaming/package.html | 9 ++++- .../net/i2p/router/web/ConfigUIHelper.java | 7 ++++ .../net/i2p/router/web/SummaryListener.java | 2 +- apps/routerconsole/jsp/css.jsi | 10 ++--- apps/routerconsole/locale/messages_pl.po | 32 +++++++-------- .../src/i2p/susi/dns/NamingServiceBean.java | 1 - apps/susidns/src/jsp/details.jsp | 3 -- build.xml | 3 +- .../support/CPUInformation/AMDInfoImpl.java | 20 +++++----- .../freenet/support/CPUInformation/CPUID.java | 40 ++++++++++--------- .../support/CPUInformation/CPUIDCPUInfo.java | 4 ++ .../support/CPUInformation/CPUInfo.java | 2 +- .../support/CPUInformation/IntelInfoImpl.java | 23 ++++++----- .../support/CPUInformation/VIACPUInfo.java | 6 ++- .../support/CPUInformation/VIAInfoImpl.java | 9 +++-- .../naming/SingleFileNamingService.java | 2 +- core/java/src/net/i2p/data/DataHelper.java | 30 ++++++++++++++ history.txt | 9 +++++ installer/install.xml | 3 +- router/java/src/net/i2p/router/Router.java | 12 ++++-- tests/scripts/checkpo.sh | 3 +- tests/scripts/checkutf8.sh | 1 + 24 files changed, 155 insertions(+), 81 deletions(-) diff --git a/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java b/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java index fe541e57f6..becfc8ea43 100644 --- a/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java +++ b/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java @@ -97,7 +97,6 @@ public class Daemon { * * @param router * The NamingService to update, generally the root NamingService from the context. - * client applications. * @param published * The published AddressBook. This address book is published on * the user's eepsite so that others may subscribe to it. diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java index 65268e06cb..170a048db4 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java @@ -1304,6 +1304,10 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn out.flush(); } + /** + * Decode %xx encoding + * @since 0.8.7 + */ private static String decode(String s) { if (!s.contains("%")) return s; diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/package.html b/apps/ministreaming/java/src/net/i2p/client/streaming/package.html index 8418604532..3e2ce48750 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/package.html +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/package.html @@ -1,7 +1,14 @@

Implements a TCP-like (reliable, authenticated, in order) set of sockets for communicating over the IP-like (unreliable, unauthenticated, unordered) I2P -messages.

+messages. +Note that this class is split across two jars, streaming.jar and ministreaming.jar. +The interfaces and some very old code are in ministreaming.jar, but the +real work gets done in streaming.jar. Clients must have both jars +in their classpath. +Most clients will require (only) streaming.jar, ministreaming.jar, and i2p.jar +in their classpath to communicate with the router. +

When an application wants to use streams, it must fetch an {@link net.i2p.client.streaming.I2PSocketManager} from the {@link 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 49e848a244..7dc1ff4645 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java @@ -46,6 +46,13 @@ public class ConfigUIHelper extends HelperBase { return rv; } + /** + * Each language has the ISO code, the flag, and the name. + * Alphabetical by the ISO code please. + * See http://en.wikipedia.org/wiki/ISO_639-1 . + * Any language-specific flag added to the icon set must be + * added to the top-level build.xml for the updater. + */ private static final String langs[] = {"ar", "de", "en", "es", "fi", "fr", "it", "nl", "pl", "pt", "ru", "sv", "vi", "zh"}; private static final String flags[] = {"lang_ar", "de", "us", "es", "fi", "fr", "it", "nl", "pl", "pt", "ru", diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java index b897cb6f6f..4eec3a2558 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java @@ -26,7 +26,7 @@ import org.jrobin.graph.RrdGraphDef; import org.jrobin.graph.RrdGraphDefTemplate; /** - * Creates and updates the in-memory RRD database, + * Creates and updates the in-memory or on-disk RRD database, * and provides methods to generate graphs of the data * * @since 0.6.1.13 diff --git a/apps/routerconsole/jsp/css.jsi b/apps/routerconsole/jsp/css.jsi index 320c8250a8..2dbd19053c 100644 --- a/apps/routerconsole/jsp/css.jsi +++ b/apps/routerconsole/jsp/css.jsi @@ -36,20 +36,16 @@ %> console.css" rel="stylesheet" type="text/css"> <% - // make the fonts bigger for chinese if (intl.getLang().equals("zh")) { + // make the fonts bigger for chinese %> console_big.css" rel="stylesheet" type="text/css"> <% - } -%> -<% - // Use RTL theme for Arabic - if (intl.getLang().equals("ar")) { + } else if (intl.getLang().equals("ar")) { + // Use RTL theme for Arabic %> console_ar.css" rel="stylesheet" type="text/css"> <% } %> - diff --git a/apps/routerconsole/locale/messages_pl.po b/apps/routerconsole/locale/messages_pl.po index f81e44fbcd..1b5ee3de55 100644 --- a/apps/routerconsole/locale/messages_pl.po +++ b/apps/routerconsole/locale/messages_pl.po @@ -34,9 +34,9 @@ msgstr "" #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" -msgstr[0] "ms" -msgstr[1] "ms" -msgstr[2] "ms" +msgstr[0] "1 ms" +msgstr[1] "{0,number,####} ms" +msgstr[2] "{0,number,####} ms" #. seconds #. Note to translators: quantity will always be greater than one. @@ -45,9 +45,9 @@ msgstr[2] "ms" #, java-format msgid "1 sec" msgid_plural "{0} sec" -msgstr[0] "sek" -msgstr[1] "sek" -msgstr[2] "sek" +msgstr[0] "1 sek" +msgstr[1] "{0} sek" +msgstr[2] "{0} sek" #. minutes #. Note to translators: quantity will always be greater than one. @@ -56,9 +56,9 @@ msgstr[2] "sek" #, java-format msgid "1 min" msgid_plural "{0} min" -msgstr[0] "min" -msgstr[1] "min" -msgstr[2] "min" +msgstr[0] "1 min" +msgstr[1] "{0} min" +msgstr[2] "{0} min" #. hours #. Note to translators: quantity will always be greater than one. @@ -67,9 +67,9 @@ msgstr[2] "min" #, java-format msgid "1 hour" msgid_plural "{0} hours" -msgstr[0] "godz" -msgstr[1] "godz" -msgstr[2] "godz" +msgstr[0] "1 godz" +msgstr[1] "{0} godz" +msgstr[2] "{0} godz" #: ../../../core/java/src/net/i2p/data/DataHelper.java:1209 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:314 @@ -82,9 +82,9 @@ msgstr "nie dotyczy" #, java-format msgid "1 day" msgid_plural "{0} days" -msgstr[0] "dzień" -msgstr[1] "dni" -msgstr[2] "dni" +msgstr[0] "1 dzień" +msgstr[1] "{0} dni" +msgstr[2] "{0} dni" #: ../../../router/java/src/net/i2p/router/Blocklist.java:122 #, java-format @@ -222,7 +222,7 @@ msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." msgstr "" "Ponowne seedowanie: pobieranie informacji o routerze z URL seeda ({0} udane," -" {1} błędów})" +" {1} błędów)" #: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:512 msgid "NetDb entry" diff --git a/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java b/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java index 15c9cfebb2..a06230bd41 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java @@ -17,7 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * @since 0.8.7 */ package i2p.susi.dns; diff --git a/apps/susidns/src/jsp/details.jsp b/apps/susidns/src/jsp/details.jsp index 550278aeb1..ea225c339a 100644 --- a/apps/susidns/src/jsp/details.jsp +++ b/apps/susidns/src/jsp/details.jsp @@ -1,7 +1,5 @@ <% /* - * Created on Sep 02, 2005 - * * This file is part of susidns project, see http://susi.i2p/ * * Copyright (C) 2005 @@ -20,7 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Revision: 1.3 $ */ // http://www.crazysquirrel.com/computing/general/form-encoding.jspx diff --git a/build.xml b/build.xml index f337e094d8..c59f7c7c9f 100644 --- a/build.xml +++ b/build.xml @@ -31,6 +31,7 @@ + @@ -390,7 +391,7 @@ - + diff --git a/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java b/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java index bfbb3e9b62..9b60af9060 100644 --- a/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java +++ b/core/java/src/freenet/support/CPUInformation/AMDInfoImpl.java @@ -1,5 +1,9 @@ package freenet.support.CPUInformation; +/** + * Moved out of CPUID.java + * @since 0.8.7 + */ class AMDInfoImpl extends CPUIDCPUInfo implements AMDCPUInfo { protected static boolean isK6Compatible = false; @@ -13,19 +17,18 @@ class AMDInfoImpl extends CPUIDCPUInfo implements AMDCPUInfo // If modelString != null, the cpu is considered correctly identified. protected static String modelString = null; - @Override public boolean IsK6Compatible(){ return isK6Compatible; } - @Override + public boolean IsK6_2_Compatible(){ return isK6_2_Compatible; } - @Override + public boolean IsK6_3_Compatible(){ return isK6_3_Compatible; } - @Override + public boolean IsGeodeCompatible(){ return isGeodeCompatible; } - @Override + public boolean IsAthlonCompatible(){ return isAthlonCompatible; } - @Override + public boolean IsAthlon64Compatible(){ return isAthlon64Compatible; } - @Override + public boolean IsBobcatCompatible(){ return isBobcatCompatible; } static @@ -33,7 +36,6 @@ class AMDInfoImpl extends CPUIDCPUInfo implements AMDCPUInfo identifyCPU(); } - @Override public String getCPUModelString() throws UnknownCPUException { if (modelString != null) @@ -348,7 +350,7 @@ class AMDInfoImpl extends CPUIDCPUInfo implements AMDCPUInfo } } } - @Override + public boolean hasX64() { return isX64; diff --git a/core/java/src/freenet/support/CPUInformation/CPUID.java b/core/java/src/freenet/support/CPUInformation/CPUID.java index 7bec461e3d..439555fce2 100644 --- a/core/java/src/freenet/support/CPUInformation/CPUID.java +++ b/core/java/src/freenet/support/CPUInformation/CPUID.java @@ -99,7 +99,7 @@ public class CPUID { private static native CPUIDResult doCPUID(int iFunction); - public static String getCPUVendorID() + static String getCPUVendorID() { CPUIDResult c = doCPUID(0); StringBuilder sb= new StringBuilder(13); @@ -120,68 +120,72 @@ public class CPUID { return sb.toString(); } - public static int getCPUFamily() + static int getCPUFamily() { CPUIDResult c = doCPUID(1); return (c.EAX >> 8) & 0xf; } - public static int getCPUModel() + static int getCPUModel() { CPUIDResult c = doCPUID(1); return (c.EAX >> 4) & 0xf; } - public static int getCPUExtendedModel() + static int getCPUExtendedModel() { CPUIDResult c = doCPUID(1); return (c.EAX >> 16) & 0xf; } - public static int getCPUType() + static int getCPUType() { CPUIDResult c = doCPUID(1); return (c.EAX >> 12) & 0xf; } - public static int getCPUExtendedFamily() + static int getCPUExtendedFamily() { CPUIDResult c = doCPUID(1); return (c.EAX >> 20) & 0xff; } - public static int getCPUStepping() + static int getCPUStepping() { CPUIDResult c = doCPUID(1); return c.EAX & 0xf; } - public static int getEDXCPUFlags() + static int getEDXCPUFlags() { CPUIDResult c = doCPUID(1); return c.EDX; } - public static int getECXCPUFlags() + static int getECXCPUFlags() { CPUIDResult c = doCPUID(1); return c.ECX; } - public static int getExtendedEBXCPUFlags() + static int getExtendedEBXCPUFlags() { CPUIDResult c = doCPUID(0x80000001); return c.EBX; } - public static int getExtendedECXCPUFlags() + static int getExtendedECXCPUFlags() { CPUIDResult c = doCPUID(0x80000001); return c.ECX; } - public static int getExtendedEDXCPUFlags() + + /** @since 0.8.7 */ + static int getExtendedEDXCPUFlags() { CPUIDResult c = doCPUID(0x80000001); return c.EDX; } - //Returns a CPUInfo item for the current type of CPU - //If I could I would declare this method in a interface named - //CPUInfoProvider and implement that interface in this class. - //This would make it easier for other people to understand that there - //is nothing preventing them from coding up new providers, probably using - //other detection methods than the x86-only CPUID instruction + /** + * Returns a CPUInfo item for the current type of CPU + * If I could I would declare this method in a interface named + * CPUInfoProvider and implement that interface in this class. + * This would make it easier for other people to understand that there + * is nothing preventing them from coding up new providers, probably using + * other detection methods than the x86-only CPUID instruction + */ public static CPUInfo getInfo() throws UnknownCPUException { if(!_nativeOk) diff --git a/core/java/src/freenet/support/CPUInformation/CPUIDCPUInfo.java b/core/java/src/freenet/support/CPUInformation/CPUIDCPUInfo.java index 90ce047e07..b68e5959fd 100644 --- a/core/java/src/freenet/support/CPUInformation/CPUIDCPUInfo.java +++ b/core/java/src/freenet/support/CPUInformation/CPUIDCPUInfo.java @@ -1,5 +1,9 @@ package freenet.support.CPUInformation; +/** + * Moved out of CPUID.java + * @since 0.8.7 + */ abstract class CPUIDCPUInfo { protected static boolean isX64 = false; diff --git a/core/java/src/freenet/support/CPUInformation/CPUInfo.java b/core/java/src/freenet/support/CPUInformation/CPUInfo.java index 3dbd2a69a2..0acb011e71 100644 --- a/core/java/src/freenet/support/CPUInformation/CPUInfo.java +++ b/core/java/src/freenet/support/CPUInformation/CPUInfo.java @@ -23,7 +23,7 @@ public interface CPUInfo public String getVendor(); /** * @return A string detailing what type of CPU that is present in the machine. I.e. 'Pentium IV' etc. - * @throws UnknownCPUException If for any reson the retrieval of the requested information + * @throws UnknownCPUException If for any reason the retrieval of the requested information * failed. The message encapsulated in the execption indicates the * cause of the failure. */ diff --git a/core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java b/core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java index 7b6e6df321..c597705f6b 100644 --- a/core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java +++ b/core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java @@ -1,5 +1,9 @@ package freenet.support.CPUInformation; +/** + * Moved out of CPUID.java + * @since 0.8.7 + */ class IntelInfoImpl extends CPUIDCPUInfo implements IntelCPUInfo { protected static boolean isPentiumCompatible = false; @@ -15,23 +19,22 @@ class IntelInfoImpl extends CPUIDCPUInfo implements IntelCPUInfo // If modelString != null, the cpu is considered correctly identified. protected static String modelString = null; - @Override public boolean IsPentiumCompatible(){ return isPentiumCompatible; } - @Override + public boolean IsPentiumMMXCompatible(){ return isPentiumMMXCompatible; } - @Override + public boolean IsPentium2Compatible(){ return isPentium2Compatible; } - @Override + public boolean IsPentium3Compatible(){ return isPentium3Compatible; } - @Override + public boolean IsPentium4Compatible(){ return isPentium4Compatible; } - @Override + public boolean IsPentiumMCompatible(){ return isPentiumMCompatible; } - @Override + public boolean IsAtomCompatible(){ return isAtomCompatible; } - @Override + public boolean IsCore2Compatible(){ return isCore2Compatible; } - @Override + public boolean IsCoreiCompatible(){ return isCoreiCompatible; } static @@ -290,7 +293,7 @@ class IntelInfoImpl extends CPUIDCPUInfo implements IntelCPUInfo } } } - @Override + public boolean hasX64() { return isX64; } diff --git a/core/java/src/freenet/support/CPUInformation/VIACPUInfo.java b/core/java/src/freenet/support/CPUInformation/VIACPUInfo.java index f09131b522..9505e4ef7b 100644 --- a/core/java/src/freenet/support/CPUInformation/VIACPUInfo.java +++ b/core/java/src/freenet/support/CPUInformation/VIACPUInfo.java @@ -1,5 +1,9 @@ package freenet.support.CPUInformation; +/** + * Moved out of CPUID.java + * @since 0.8.7 + */ public interface VIACPUInfo extends CPUInfo{ /** @@ -13,4 +17,4 @@ public interface VIACPUInfo extends CPUInfo{ -} \ No newline at end of file +} diff --git a/core/java/src/freenet/support/CPUInformation/VIAInfoImpl.java b/core/java/src/freenet/support/CPUInformation/VIAInfoImpl.java index 5a112455f4..7d6d91bfd4 100644 --- a/core/java/src/freenet/support/CPUInformation/VIAInfoImpl.java +++ b/core/java/src/freenet/support/CPUInformation/VIAInfoImpl.java @@ -1,5 +1,9 @@ package freenet.support.CPUInformation; +/** + * Moved out of CPUID.java + * @since 0.8.7 + */ class VIAInfoImpl extends CPUIDCPUInfo implements VIACPUInfo { protected static boolean isC3Compatible = false; @@ -9,9 +13,8 @@ class VIAInfoImpl extends CPUIDCPUInfo implements VIACPUInfo { protected static String modelString = null; - @Override public boolean IsC3Compatible(){ return isC3Compatible; } - @Override + public boolean IsNanoCompatible(){ return isNanoCompatible; } static @@ -19,7 +22,6 @@ class VIAInfoImpl extends CPUIDCPUInfo implements VIACPUInfo { identifyCPU(); } - @Override public String getCPUModelString() { if (modelString != null) @@ -28,7 +30,6 @@ class VIAInfoImpl extends CPUIDCPUInfo implements VIACPUInfo { } - @Override public boolean hasX64() { return false; diff --git a/core/java/src/net/i2p/client/naming/SingleFileNamingService.java b/core/java/src/net/i2p/client/naming/SingleFileNamingService.java index baa8b9073b..6d7926f401 100644 --- a/core/java/src/net/i2p/client/naming/SingleFileNamingService.java +++ b/core/java/src/net/i2p/client/naming/SingleFileNamingService.java @@ -69,7 +69,7 @@ public class SingleFileNamingService extends NamingService { } /** - * @return the base file name + * @return the file's absolute path */ @Override public String getName() { diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java index 3d6b367792..d1228f40b9 100644 --- a/core/java/src/net/i2p/data/DataHelper.java +++ b/core/java/src/net/i2p/data/DataHelper.java @@ -1362,6 +1362,12 @@ public class DataHelper { return rv; } + /** + * Same as orig.getBytes("UTF-8") but throws an unchecked RuntimeException + * instead of an UnsupportedEncodingException if no UTF-8, for ease of use. + * + * @throws RuntimeException + */ public static byte[] getUTF8(String orig) { if (orig == null) return null; try { @@ -1370,10 +1376,26 @@ public class DataHelper { throw new RuntimeException("no utf8!?"); } } + + /** + * Same as orig.getBytes("UTF-8") but throws an unchecked RuntimeException + * instead of an UnsupportedEncodingException if no UTF-8, for ease of use. + * + * @throws RuntimeException + * @deprecated unused + */ public static byte[] getUTF8(StringBuffer orig) { if (orig == null) return null; return getUTF8(orig.toString()); } + + /** + * Same as new String(orig, "UTF-8") but throws an unchecked RuntimeException + * instead of an UnsupportedEncodingException if no UTF-8, for ease of use. + * + * @throws RuntimeException + * @deprecated unused + */ public static String getUTF8(byte orig[]) { if (orig == null) return null; try { @@ -1382,6 +1404,14 @@ public class DataHelper { throw new RuntimeException("no utf8!?"); } } + + /** + * Same as new String(orig, "UTF-8") but throws an unchecked RuntimeException + * instead of an UnsupportedEncodingException if no UTF-8, for ease of use. + * + * @throws RuntimeException + * @deprecated unused + */ public static String getUTF8(byte orig[], int offset, int len) { if (orig == null) return null; try { diff --git a/history.txt b/history.txt index 6c44993839..7e50e3720a 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,12 @@ +2011-06-26 zzz + * Fixes after review: + - Fix Polish po file + - Install as a service by default on Windows again + - Change CPUID getters to package private + - Split new jbigi install messages into two lines + - Test script updates + - Javadocs + 2011-06-23 zzz * IRC: Allow outbound INVITE diff --git a/installer/install.xml b/installer/install.xml index 1e5b041fe6..519108260d 100644 --- a/installer/install.xml +++ b/installer/install.xml @@ -224,7 +224,8 @@ - + + Automatically start I2P in the background diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java index 5df671c3ec..9aba00087f 100644 --- a/router/java/src/net/i2p/router/Router.java +++ b/router/java/src/net/i2p/router/Router.java @@ -1267,9 +1267,11 @@ public class Router { boolean success = FileUtil.copy(path, path + ".bak", true, true); if (success) { boolean success2 = jcpuidLib.delete(); - if (success2) + if (success2) { System.out.println("New jbigi.jar detected, moved jcpuid library to " + - path + ".bak, check logs for successful installation of new library"); + path + ".bak"); + System.out.println("Check logs for successful installation of new library"); + } } } @@ -1279,9 +1281,11 @@ public class Router { boolean success = FileUtil.copy(path, path + ".bak", true, true); if (success) { boolean success2 = jbigiLib.delete(); - if (success2) + if (success2) { System.out.println("New jbigi.jar detected, moved jbigi library to " + - path + ".bak, check logs for successful installation of new library"); + path + ".bak"); + System.out.println("Check logs for successful installation of new library"); + } } } } diff --git a/tests/scripts/checkpo.sh b/tests/scripts/checkpo.sh index 13f080833b..c3e17b6616 100755 --- a/tests/scripts/checkpo.sh +++ b/tests/scripts/checkpo.sh @@ -14,7 +14,8 @@ DIRS="\ apps/i2psnark/locale \ apps/susidns/locale \ apps/susimail/locale \ - apps/desktopgui/locale" + apps/desktopgui/locale \ + debian/po" for i in `find $DIRS -maxdepth 1 -type f -name *.po` do diff --git a/tests/scripts/checkutf8.sh b/tests/scripts/checkutf8.sh index 4753cbd300..04694f1c20 100755 --- a/tests/scripts/checkutf8.sh +++ b/tests/scripts/checkutf8.sh @@ -18,6 +18,7 @@ DIRS="\ apps/susidns/locale \ apps/susimail/locale \ apps/desktopgui/locale \ + debian/po \ installer/resources/eepsite.help/help \ installer/resources/initialNews \ installer/resources/proxy \