From: Kill Your TV Date: Mon, 18 Apr 2011 16:43:40 +0000 Subject: path substitution The purpose of this patch is the change the values handled by the Izpack based installer. Non-applicable sections (e.g., portable & windows) are also removed for the Debian wrapper.config to try to prevent confusion. --- installer/resources/eepget | 2 +- installer/resources/i2prouter | 8 ++++---- installer/resources/runplain.sh | 6 +++--- installer/resources/wrapper.config | 17 ++++++++--------- 4 files changed, 16 insertions(+), 17 deletions(-) --- a/installer/resources/eepget +++ b/installer/resources/eepget @@ -1,3 +1,3 @@ #!/bin/sh -I2P="%INSTALL_PATH" +I2P="/usr/share/i2p" java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@" --- a/installer/resources/i2prouter +++ b/installer/resources/i2prouter @@ -28,8 +28,8 @@ # Note that (percent)INSTALL_PATH and (percent)SYSTEM_java_io_tmpdir # should have been replaced by the izpack installer. # If you did not run the installer, replace them with the appropriate path. -I2P="%INSTALL_PATH" -I2PTEMP="%SYSTEM_java_io_tmpdir" +I2P="/usr/share/i2p" +I2PTEMP="/tmp" # PORTABLE installation: # Use the following instead. #I2PTEMP="%INSTALL_PATH" @@ -49,8 +49,8 @@ #RUN_AS_USER= # Wrapper -WRAPPER_CMD="$I2P/i2psvc" -WRAPPER_CONF="$I2P/wrapper.config" +WRAPPER_CMD="/usr/sbin/wrapper" +WRAPPER_CONF="/etc/i2p/wrapper.config" # Priority at which to run the wrapper. See "man nice" for valid priorities. # nice is only used if a priority is specified. --- a/installer/resources/runplain.sh +++ b/installer/resources/runplain.sh @@ -11,8 +11,8 @@ # Note that (percent)INSTALL_PATH and (percent)SYSTEM_java_io_tmpdir # should have been replaced by the izpack installer. # If you did not run the installer, replace them with the appropriate path. -I2P="%INSTALL_PATH" -I2PTEMP="%SYSTEM_java_io_tmpdir" +I2P="/usr/share/i2p" +I2PTEMP="/tmp" # Having IPv6 enabled can cause problems with certain configurations. Changing the # next value to true may help. --- a/installer/resources/wrapper.config +++ b/installer/resources/wrapper.config @@ -8,22 +8,13 @@ # click "Shutdown", wait 11 minutes, then start i2p. # # WARNING - The wrapper is NOT run (and this file is not used) -# if you start I2P with the 'no window' icon on Windows, or -# with the runplain.sh script on Linux. Use the 'restartable' -# icon on Windows or the i2prouter script on Linux to run the wrapper. +# if you start I2P with the i2prouter-nowrapper script in Linux. +# Use i2prouter or the initscript to run the wrapper. # # NOTE - Directory organization: # The standard I2P Installation will set up a "split" directory structure # with code in the install directory, data and configuration files in the # user's home directory, and temporary files in the system temporary directory. -# To set up a single-directory "portable" installation suitable for -# a USB stick, make several changes specified below (search for PORTABLE). -# -# NOTE - The izpack installer performs variable subsitiution on this -# file upon installation. If you did not use izpack, you must -# find and replace all instances of (dollar)INSTALL_PATH and -# (dollar)SYSTEM_java_io_tmpdir with appropriate values -# (perhaps . and /var/tmp, respectively) # #******************************************************************** # Java Application @@ -51,13 +42,14 @@ # classes, or all the classes of i2p.jar, are in a different directory). # Be sure there are no other duplicate classes. # -wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar +wrapper.java.classpath.1=/usr/share/i2p/lib/*.jar +wrapper.java.classpath.2=/usr/share/java/wrapper.jar # uncomment this to use the system classpath as well (e.g. to get tools.jar) -# wrapper.java.classpath.2=%CLASSPATH% +# wrapper.java.classpath.3=%CLASSPATH% -# Java Library Path (location of Wrapper.DLL or libwrapper.so) -wrapper.java.library.path.1=$INSTALL_PATH -wrapper.java.library.path.2=$INSTALL_PATH/lib +# Java Library Path (location of libjbigi/libjcpuid) +wrapper.java.library.path.1=/usr/lib/jni +wrapper.java.library.path.2=/usr/share/java/lib # Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode. wrapper.java.additional.auto_bits=TRUE @@ -67,7 +59,7 @@ wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true wrapper.java.additional.3=-Dorg.mortbay.xml.XmlParser.NotValidating=true -wrapper.java.additional.4=-Di2p.dir.base="$INSTALL_PATH" +wrapper.java.additional.4=-Di2p.dir.base=/usr/share/i2p wrapper.java.additional.4.stripquotes=TRUE # On some IPv6 enabled systems, I2P and other network-enabled java applications @@ -137,11 +129,7 @@ # tell the router where to find the wrapper log # (change X to the next available number) # wrapper.java.additional.X=-Dwrapper.logfile=/path/to/wrapper.log -wrapper.logfile=$SYSTEM_java_io_tmpdir/wrapper.log -# PORTABLE installation: -# Use the following instead. I2P will find the logfile here, -# no need for a wrapper.java.additional line too. -#wrapper.logfile=$INSTALL_PATH/wrapper.log +wrapper.logfile=/tmp/wrapper.log # Format of output for the log file. # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread, @@ -203,10 +191,7 @@ # you should copy this file, change the location or file name, # and edit the i2prouter script to change the WRAPPER_CONF setting # to point to the new wrapper.config location. -wrapper.java.pidfile=$SYSTEM_java_io_tmpdir/routerjvm.pid -# PORTABLE installation: -# Use the following instead. -#wrapper.java.pidfile=$INSTALL_PATH/routerjvm.pid +wrapper.java.pidfile=/tmp/routerjvm.pid # pid file for the service monitoring the JVM # # From i2prouter: @@ -217,10 +202,7 @@ # # This means i2prouter looks for './i2p.pid'. # See comments above for wrapper.java.pidfile -wrapper.pidfile=$SYSTEM_java_io_tmpdir/i2p.pid -# PORTABLE installation: -# Use the following instead. -#wrapper.pidfile=$INSTALL_PATH/i2p.pid +wrapper.pidfile=/tmp/i2p.pid #******************************************************************** # Wrapper General Properties @@ -237,30 +219,3 @@ wrapper.umask=0022 wrapper.java.umask=0022 wrapper.logfile.umask=077 - -#******************************************************************** -# Wrapper NT Service Properties -#******************************************************************** -# WARNING - Do not modify any of these properties when an application -# using this configuration file has been installed as a service. -# Please uninstall the service before modifying this section. The -# service can then be reinstalled. - -# Name of the service -wrapper.ntservice.name=i2p - -# Display name of the service -wrapper.ntservice.displayname=I2P Service - -# Description of the service -wrapper.ntservice.description=The I2P router service - -# Service dependencies. Add dependencies as needed starting from 1 -wrapper.ntservice.dependency.1= - -# Mode in which the service is installed. AUTO_START or DEMAND_START -wrapper.ntservice.starttype=AUTO_START - -# Allow the service to interact with the desktop. -wrapper.ntservice.interactive=false -