Changeset fa235d97
- Timestamp:
- Dec 22, 2012 5:51:15 PM (8 years ago)
- Branches:
- master
- Children:
- 5d52372
- Parents:
- 42f8c71d
- Location:
- debian
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
debian/i2p.install
r42f8c71d rfa235d97 1 1 pkg-temp/i2prouter usr/bin 2 2 pkg-temp/wrapper.config etc/i2p 3 pkg-temp/locale usr/share/i2p -
debian/patches/0001-path-substitution.patch
r42f8c71d rfa235d97 15 15 4 files changed, 24 insertions(+), 134 deletions(-) 16 16 17 diff --git a/installer/resources/eepget b/installer/resources/eepget18 index 080bcc8..f2e84ba 10064419 17 --- a/installer/resources/eepget 20 18 +++ b/installer/resources/eepget … … 24 22 +I2P="/usr/share/i2p" 25 23 java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@" 26 diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter27 index cdf3e71..266dc16 10064428 24 --- a/installer/resources/i2prouter 29 25 +++ b/installer/resources/i2prouter … … 39 35 @@ -24,16 +24,9 @@ 40 36 # These settings can be modified to fit the needs of your application 41 # Optimized for use with version 3.5.1 6of the Wrapper.37 # Optimized for use with version 3.5.17 of the Wrapper. 42 38 43 39 -# Paths … … 57 53 # Application 58 54 APP_NAME="i2p" 59 @@ -61,8 +54,8 @@ fi55 @@ -61,8 +54,8 @@ 60 56 #RUN_AS_USER= 61 57 … … 68 64 # Priority at which to run the wrapper. See "man nice" for valid priorities. 69 65 # nice is only used if a priority is specified. 70 @@ -1 73,48 +166,6 @@ fi66 @@ -167,48 +160,6 @@ 71 67 # Workaround for Gentoo 72 68 JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF") … … 97 93 - 98 94 -failed() { 99 - echo "** Failed to load the wrapper**"95 - echo "**`gettext 'Failed to load the wrapper'`**" 100 96 - case `uname -s` in 101 97 - FreeBSD) … … 117 113 then 118 114 COMMAND="$FIXED_COMMAND" 119 @@ -91 8,9 +869,6 @@ console() {115 @@ -912,9 +863,6 @@ 120 116 # The string passed to eval must handles spaces in paths correctly. 121 COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP $ADDITIONAL_PARA"117 COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP wrapper.script.version=3.5.17 $ADDITIONAL_PARA" 122 118 eval $COMMAND_LINE 123 119 - if [ "$?" -ne "0" ]; then … … 127 123 eval echo `gettext '$APP_LONG_NAME is already running.'` 128 124 exit 1 129 @@ -10 44,9 +992,6 @@ start() {125 @@ -1038,9 +986,6 @@ 130 126 # The string passed to eval must handles spaces in paths correctly. 131 COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP $ADDITIONAL_PARA"127 COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP wrapper.script.version=3.5.17 $ADDITIONAL_PARA" 132 128 eval $COMMAND_LINE 133 129 - if [ "$?" -ne "0" ]; then … … 137 133 eval echo `gettext '$APP_LONG_NAME is already running.'` 138 134 exit 1 139 @@ -18 87,18 +1832,9 @@ docommand() {135 @@ -1850,18 +1795,9 @@ 140 136 status 141 137 ;; … … 159 155 160 156 'dump') 161 diff --git a/installer/resources/runplain.sh b/installer/resources/runplain.sh162 index 949a7ab..48b82fb 100644163 157 --- a/installer/resources/runplain.sh 164 158 +++ b/installer/resources/runplain.sh … … 174 168 # Having IPv6 enabled can cause problems with certain configurations. Changing the 175 169 # next value to true may help. 176 diff --git a/installer/resources/wrapper.config b/installer/resources/wrapper.config177 index cfc5918..d4a5de9 100644178 170 --- a/installer/resources/wrapper.config 179 171 +++ b/installer/resources/wrapper.config … … 203 195 #******************************************************************** 204 196 # Java Application 205 @@ -60,13 +51,14 @@ wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp197 @@ -60,13 +51,14 @@ 206 198 # classes, or all the classes of i2p.jar, are in a different directory). 207 199 # Be sure there are no other duplicate classes. … … 223 215 # Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode. 224 216 wrapper.java.additional.auto_bits=TRUE 225 @@ -76,7 +68,7 @@ wrapper.java.additional.auto_bits=TRUE217 @@ -76,7 +68,7 @@ 226 218 wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt 227 219 wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true … … 232 224 233 225 # On some IPv6 enabled systems, I2P and other network-enabled java applications 234 @@ -144,11 +136,7 @@ wrapper.console.loglevel=INFO226 @@ -144,11 +136,7 @@ 235 227 # NOTE: On Linux/Mac this is overridden in the i2prouter script; changes here will have no effect. 236 228 # Windows users may wish to change this to %APPDATA%\I2P\wrapper.log … … 245 237 # Format of output for the log file. 246 238 # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread, 247 @@ -218,11 +206,7 @@ wrapper.use_system_time=false239 @@ -218,11 +206,7 @@ 248 240 # Linux/Mac users, do not set here, see settings in the i2prouter script. 249 241 # Directory must exist or the wrapper will fail to start. … … 258 250 # From i2prouter: 259 251 # 260 @@ -236,10 +220,7 @@ wrapper.use_system_time=false252 @@ -236,10 +220,7 @@ 261 253 # Linux/Mac users, do not set here, see settings in the i2prouter script. 262 254 # Directory must exist or the wrapper will fail to start. … … 270 262 #******************************************************************** 271 263 # Wrapper General Properties 272 @@ -256,30 +237,3 @@ wrapper.console.title=I2P Service264 @@ -256,30 +237,3 @@ 273 265 wrapper.umask=0022 274 266 wrapper.java.umask=0022
Note: See TracChangeset
for help on using the changeset viewer.