echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

quoting fixups

Browse Source
This commit is contained in:
zzz
2012-12-22 19:30:36 +00:00
parent 470b8c59e7
commit 6d2fa690dc
3 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
history.txt
View File

@@ -1,3 +1,8 @@
2012-12-22 zzz
- i2psnark: Add announce list support (BEP 12) (ticket #778)
- i2ptunnel: Add more tunnel quantity options for servers
- Jetty: Update to Apache Tomcat 0.6.36
2012-12-22 kytv 2012-12-22 kytv
* French language translation update from Transifex * French language translation update from Transifex

54
installer/resources/i2prouter
View File

@@ -493,7 +493,7 @@ gettext() {
outputFile() { outputFile() {
if [ -f "$1" ] if [ -f "$1" ]
then then
echo ' $1 Found but not executable.'; echo " $1 Found but not executable.";
else else
echo " $1" echo " $1"
fi fi
@@ -656,7 +656,7 @@ checkUser() {
fi fi
if [ "`$IDEXE -u -n "$RUN_AS_USER" 2>/dev/null`" != "$RUN_AS_USER" ] if [ "`$IDEXE -u -n "$RUN_AS_USER" 2>/dev/null`" != "$RUN_AS_USER" ]
then then
echo 'User $RUN_AS_USER does not exist.' echo "User $RUN_AS_USER does not exist."
exit 1 exit 1
fi fi
@@ -794,12 +794,12 @@ getpid() {
then then
# This is a stale pid file. # This is a stale pid file.
rm -f "$PIDFILE" rm -f "$PIDFILE"
echo 'Removed stale pid file: $PIDFILE' echo "Removed stale pid file: $PIDFILE"
pid="" pid=""
fi fi
fi fi
else else
echo 'Cannot read $PIDFILE.' echo "Cannot read $PIDFILE."
exit 1 exit 1
fi fi
fi fi
@@ -982,7 +982,7 @@ startwait() {
macosxstart() { macosxstart() {
# The daemon has been installed. # The daemon has been installed.
echo 'Starting $APP_LONG_NAME. Detected Mac OSX and installed launchd daemon.' echo "Starting $APP_LONG_NAME. Detected Mac OSX and installed launchd daemon."
if [ `id | sed 's/^uid=//;s/(.*$//'` != "0" ] ; then if [ `id | sed 's/^uid=//;s/(.*$//'` != "0" ] ; then
eval echo `gettext 'Must be root to perform this action.'` eval echo `gettext 'Must be root to perform this action.'`
exit 1 exit 1
@@ -1010,7 +1010,7 @@ macosxstart() {
upstartstart() { upstartstart() {
# The daemon has been installed. # The daemon has been installed.
echo 'Starting $APP_LONG_NAME. Detected Linux and installed upstart.' echo "Starting $APP_LONG_NAME. Detected Linux and installed upstart."
if [ `id | sed 's/^uid=//;s/(.*$//'` != "0" ] ; then if [ `id | sed 's/^uid=//;s/(.*$//'` != "0" ] ; then
eval echo `gettext 'Must be root to perform this action.'` eval echo `gettext 'Must be root to perform this action.'`
exit 1 exit 1
@@ -1156,11 +1156,11 @@ graceful() {
} }
pause() { pause() {
echo 'Pausing $APP_LONG_NAME.' echo "Pausing $APP_LONG_NAME."
} }
resume() { resume() {
echo 'Resuming $APP_LONG_NAME.' echo "Resuming $APP_LONG_NAME."
} }
status() { status() {
@@ -1182,9 +1182,9 @@ status() {
} }
installUpstart() { installUpstart() {
echo ' Installing the $APP_LONG_NAME daemon using upstart..' echo " Installing the $APP_LONG_NAME daemon using upstart.."
if [ -f "${APP_NAME}.conf" ] ; then if [ -f "${APP_NAME}.conf" ] ; then
echo ' a custom upstart conf file ${APP_NAME}.conf found' echo " a custom upstart conf file ${APP_NAME}.conf found"
cp "${REALDIR}/${APP_NAME}.install" "/etc/init/${APP_NAME}.conf" cp "${REALDIR}/${APP_NAME}.install" "/etc/init/${APP_NAME}.conf"
else else
echo ' creating default upstart conf file..' echo ' creating default upstart conf file..'
@@ -1328,7 +1328,7 @@ installdaemon() {
echo "esac" >> /etc/rc.d/${APP_NAME} echo "esac" >> /etc/rc.d/${APP_NAME}
chmod 755 /etc/rc.d/${APP_NAME} chmod 755 /etc/rc.d/${APP_NAME}
chown root:root /etc/rc.d/${APP_NAME} chown root:root /etc/rc.d/${APP_NAME}
echo ' The $APP_LONG_NAME daemon has been installed.' echo " The $APP_LONG_NAME daemon has been installed."
echo ' Add \"i2p\" to the DAEMONS variable in /etc/rc.conf to enable.' echo ' Add \"i2p\" to the DAEMONS variable in /etc/rc.conf to enable.'
else else
# We'll end up here if systemd is enabled. # We'll end up here if systemd is enabled.
@@ -1369,7 +1369,7 @@ installdaemon() {
if [ -n "$USE_UPSTART" -a -d "/etc/init" ] ; then if [ -n "$USE_UPSTART" -a -d "/etc/init" ] ; then
installUpstart installUpstart
else else
echo ' Installing the $APP_LONG_NAME daemon using init.d..' echo " Installing the $APP_LONG_NAME daemon using init.d.."
ln -s "$REALPATH" "/etc/init.d/$APP_NAME" ln -s "$REALPATH" "/etc/init.d/$APP_NAME"
update-rc.d "$APP_NAME" defaults update-rc.d "$APP_NAME" defaults
fi fi
@@ -1402,10 +1402,10 @@ installdaemon() {
elif [ "$DIST_OS" = "aix" ] ; then elif [ "$DIST_OS" = "aix" ] ; then
echo 'Detected AIX:' echo 'Detected AIX:'
if [ -f "/etc/rc.d/init.d/$APP_NAME" ] ; then if [ -f "/etc/rc.d/init.d/$APP_NAME" ] ; then
echo ' The $APP_LONG_NAME daemon is already installed as rc.d script.' echo " The $APP_LONG_NAME daemon is already installed as rc.d script."
exit 1 exit 1
elif [ -n "`/usr/sbin/lsitab $APP_NAME`" -a -n "`/usr/bin/lssrc -S -s $APP_NAME`" ] ; then elif [ -n "`/usr/sbin/lsitab $APP_NAME`" -a -n "`/usr/bin/lssrc -S -s $APP_NAME`" ] ; then
echo ' The $APP_LONG_NAME daemon is already installed as SRC service.' echo " The $APP_LONG_NAME daemon is already installed as SRC service."
exit 1 exit 1
else else
eval echo " `gettext 'Installing the $APP_LONG_NAME daemon'`.." eval echo " `gettext 'Installing the $APP_LONG_NAME daemon'`.."
@@ -1536,7 +1536,7 @@ removedaemon() {
/sbin/chkconfig --del "$APP_NAME" /sbin/chkconfig --del "$APP_NAME"
rm -f "/etc/init.d/$APP_NAME" rm -f "/etc/init.d/$APP_NAME"
elif [ -f "/etc/init/${APP_NAME}.conf" ] ; then elif [ -f "/etc/init/${APP_NAME}.conf" ] ; then
echo ' Removing $APP_LONG_NAME daemon from upstart...' echo " Removing $APP_LONG_NAME daemon from upstart..."
rm "/etc/init/${APP_NAME}.conf" rm "/etc/init/${APP_NAME}.conf"
else else
eval echo " `gettext 'The $APP_LONG_NAME daemon is not currently installed.'`" eval echo " `gettext 'The $APP_LONG_NAME daemon is not currently installed.'`"
@@ -1575,11 +1575,11 @@ removedaemon() {
elif [ -f /etc/lsb-release -o -f /etc/debian_version ] ; then elif [ -f /etc/lsb-release -o -f /etc/debian_version ] ; then
echo 'Detected Debian-based distribution:' echo 'Detected Debian-based distribution:'
if [ -f "/etc/init.d/$APP_NAME" ] ; then if [ -f "/etc/init.d/$APP_NAME" ] ; then
echo ' Removing $APP_LONG_NAME daemon from init.d...' echo " Removing $APP_LONG_NAME daemon from init.d..."
update-rc.d -f "$APP_NAME" remove update-rc.d -f "$APP_NAME" remove
rm -f "/etc/init.d/$APP_NAME" rm -f "/etc/init.d/$APP_NAME"
elif [ -f "/etc/init/${APP_NAME}.conf" ] ; then elif [ -f "/etc/init/${APP_NAME}.conf" ] ; then
echo ' Removing $APP_LONG_NAME daemon from upstart...' echo " Removing $APP_LONG_NAME daemon from upstart..."
rm "/etc/init/${APP_NAME}.conf" rm "/etc/init/${APP_NAME}.conf"
else else
eval echo " `gettext 'The $APP_LONG_NAME daemon is not currently installed.'`" eval echo " `gettext 'The $APP_LONG_NAME daemon is not currently installed.'`"
@@ -1674,7 +1674,7 @@ removedaemon() {
} }
dump() { dump() {
echo 'Dumping $APP_LONG_NAME...' echo "Dumping $APP_LONG_NAME..."
getpid getpid
if [ "X$pid" = "X" ] if [ "X$pid" = "X" ]
then then
@@ -1684,10 +1684,10 @@ dump() {
if [ $? -ne 0 ] if [ $? -ne 0 ]
then then
echo 'Failed to dump $APP_LONG_NAME.' echo "Failed to dump $APP_LONG_NAME."
exit 1 exit 1
else else
echo 'Dumped $APP_LONG_NAME.' echo "Dumped $APP_LONG_NAME."
fi fi
fi fi
} }
@@ -1697,14 +1697,14 @@ startmsg() {
getpid getpid
if [ "X$pid" = "X" ] if [ "X$pid" = "X" ]
then then
echo 'Starting $APP_LONG_NAME... Wrapper:Stopped' echo "Starting $APP_LONG_NAME... Wrapper:Stopped"
else else
if [ "X$DETAIL_STATUS" = "X" ] if [ "X$DETAIL_STATUS" = "X" ]
then then
echo 'Starting $APP_LONG_NAME... Wrapper:Running' echo "Starting $APP_LONG_NAME... Wrapper:Running"
else else
getstatus getstatus
echo 'Starting $APP_LONG_NAME... Wrapper:$STATUS, Java:$JAVASTATUS' echo "Starting $APP_LONG_NAME... Wrapper:$STATUS, Java:$JAVASTATUS"
fi fi
fi fi
} }
@@ -1714,14 +1714,14 @@ stopmsg() {
getpid getpid
if [ "X$pid" = "X" ] if [ "X$pid" = "X" ]
then then
echo 'Stopping $APP_LONG_NAME... Wrapper:Stopped' echo "Stopping $APP_LONG_NAME... Wrapper:Stopped"
else else
if [ "X$DETAIL_STATUS" = "X" ] if [ "X$DETAIL_STATUS" = "X" ]
then then
echo 'Stopping $APP_LONG_NAME... Wrapper:Running' echo "Stopping $APP_LONG_NAME... Wrapper:Running"
else else
getstatus getstatus
echo 'Stopping $APP_LONG_NAME... Wrapper:$STATUS, Java:$JAVASTATUS' echo "Stopping $APP_LONG_NAME... Wrapper:$STATUS, Java:$JAVASTATUS"
fi fi
fi fi
} }
@@ -1731,7 +1731,7 @@ showUsage() {
if [ -n "$1" ] if [ -n "$1" ]
then then
echo 'Unexpected command: $1' echo "Unexpected command: $1"
echo ""; echo "";
fi fi

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 0; public final static long BUILD = 1;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";