Changeset ed8a065


Ignore:
Timestamp:
May 28, 2011 8:21:45 PM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
656292e1
Parents:
9834a36
Message:

Debian: Rework patch to work with the updated runplain.sh

File:
1 edited

Legend:

Unmodified
Added
Removed
  • debian/patches/0001-Update-paths.patch

    r9834a36 red8a065  
    1010 4 files changed, 16 insertions(+), 17 deletions(-)
    1111
    12 diff --git a/installer/resources/eepget b/installer/resources/eepget
    13 index 080bcc8..f2e84ba 100644
    1412--- a/installer/resources/eepget
    1513+++ b/installer/resources/eepget
     
    1917+I2P="/usr/share/i2p"
    2018 java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@"
    21 diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
    22 index be6ef4f..8ebe059 100644
    2319--- a/installer/resources/i2prouter
    2420+++ b/installer/resources/i2prouter
     
    3430 # Use the following instead.
    3531 #I2PTEMP="%INSTALL_PATH"
    36 @@ -33,8 +33,8 @@ APP_NAME="i2p"
     32@@ -33,8 +33,8 @@
    3733 APP_LONG_NAME="I2P Service"
    3834 
     
    4541 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
    4642 #  nice is only used if a priority is specified.
    47 diff --git a/installer/resources/runplain.sh b/installer/resources/runplain.sh
    48 index eaf2d29..e5530eb 100644
    4943--- a/installer/resources/runplain.sh
    5044+++ b/installer/resources/runplain.sh
     
    5852+I2PTEMP="/tmp"
    5953 
    60  export CP="$I2P" ; for j in "$I2P/lib/*"  ; do export CP="$CP:$j" ; done;
     54 export CP="${I2P}" ; for j in "${I2P}/lib/*"  ; do export CP="${CP}:${j}" ; done;
    6155 JAVA=java
    6256 
    63 -JAVAOPTS="-Djava.library.path=$I2P:$I2P/lib -Di2p.dir.base=$I2P -DloggerFilenameOverride=logs/log-router-@.txt"
    64 +JAVAOPTS="-Djava.library.path=/usr/lib/jni:$I2P/lib -Di2p.dir.base=$I2P -DloggerFilenameOverride=logs/log-router-@.txt"
    65  nohup $JAVA -cp "$CP" $JAVAOPTS net.i2p.router.RouterLaunch > /dev/null 2>&1 &
    66  echo $! > "$I2PTEMP/router.pid"
    67 diff --git a/installer/resources/wrapper.config b/installer/resources/wrapper.config
    68 index 380f94b..7bda095 100644
     57-JAVAOPTS="-Djava.library.path=$ {I2P}:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt"
     58+JAVAOPTS="-Djava.library.path=/usr/lib/jni:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt"
     59 nohup ${JAVA} -cp "${CP}" ${JAVAOPTS} net.i2p.router.RouterLaunch > /dev/null 2>&1 &
     60 echo $! > "${I2PTEMP}/router.pid"
    6961--- a/installer/resources/wrapper.config
    7062+++ b/installer/resources/wrapper.config
    71 @@ -45,20 +45,19 @@ wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
     63@@ -45,20 +45,19 @@
    7264 # classes, or all the classes of i2p.jar, are in a different directory).
    7365 # Be sure there are no other duplicate classes.
     
    9587 # Jetty says this is a security risk
    9688 # Uncommenting this won't help as the router forces it to true
    97 @@ -116,7 +115,7 @@ wrapper.console.loglevel=INFO
     89@@ -116,7 +115,7 @@
    9890 # tell the router where to find the wrapper log
    9991 # (change X to the next available number)
     
    10496 # Use the following instead. I2P will find the logfile here,
    10597 # no need for a wrapper.java.additional line too.
    106 @@ -182,7 +181,7 @@ wrapper.use_system_time=false
     98@@ -182,7 +181,7 @@
    10799 # you should copy this file, change the location or file name,
    108100 # and edit the i2prouter script to change the WRAPPER_CONF setting
     
    113105 # Use the following instead.
    114106 #wrapper.java.pidfile=$INSTALL_PATH/routerjvm.pid
    115 @@ -196,7 +195,7 @@ wrapper.java.pidfile=$SYSTEM_java_io_tmpdir/routerjvm.pid
     107@@ -196,7 +195,7 @@
    116108 #
    117109 # This means i2prouter looks for './i2p.pid'.
     
    122114 # Use the following instead.
    123115 #wrapper.pidfile=$INSTALL_PATH/i2p.pid
    124 --
Note: See TracChangeset for help on using the changeset viewer.