Changeset 081b692 for debian


Ignore:
Timestamp:
Jun 6, 2013 5:14:44 PM (7 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
ebc5e72
Parents:
e1c68d22
Message:

debian: refresh patch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • debian/patches/0001-path-substitution.patch

    re1c68d22 r081b692  
    3333 # This software is the proprietary information of Tanuki Software.
    3434 # You shall use it only in accordance with the terms of the
    35 @@ -24,16 +24,12 @@
     35@@ -24,21 +24,12 @@
    3636 # These settings can be modified to fit the needs of your application
    3737 # Optimized for use with version 3.5.17 of the Wrapper.
     
    4242-# If you did not run the installer, replace them with the appropriate paths.
    4343-I2P="%INSTALL_PATH"
    44 -I2P_CONFIG_DIR="%USER_HOME/.i2p"
     44-if [ "`uname -s`" == "Darwin" ]; then
     45-   if [ -d "%USER_HOME/Library/Application Support" ]; then
     46-       I2P_CONFIG_DIR="%USER_HOME/Library/Application Support/i2p"
     47-   else
     48-       I2P_CONFIG_DIR="%USER_HOME/.i2p"
     49-   fi
     50-else
     51-    I2P_CONFIG_DIR="%USER_HOME/.i2p"
     52-fi
    4553-I2PTEMP="%SYSTEM_java_io_tmpdir"
    46 -# PORTABLE installation:
    47 -# Use the following instead.
    48 -#I2PTEMP="%INSTALL_PATH"
    4954+# Read config file if found
    5055+[ -f /etc/default/i2p ] && . /etc/default/i2p
     
    5358+I2P_CONFIG_DIR="$HOME/.i2p"
    5459+I2PTEMP="/tmp"
    55  
    56  # Application
    57  APP_NAME="i2p"
    58 @@ -61,8 +57,8 @@
     60 # PORTABLE installation:
     61 # Use the following instead.
     62 #I2PTEMP="%INSTALL_PATH"
     63@@ -69,8 +60,8 @@
    5964 #RUN_AS_USER=
    6065 
     
    6772 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
    6873 #  nice is only used if a priority is specified.
    69 @@ -167,48 +163,6 @@
     74@@ -175,48 +166,6 @@
    7075 # Workaround for Gentoo
    7176 JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF")
     
    116121 then
    117122     COMMAND="$FIXED_COMMAND"
    118 @@ -920,9 +874,6 @@
     123@@ -928,9 +877,6 @@
    119124         # The string passed to eval must handles spaces in paths correctly.
    120125         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"
     
    126131         eval echo `gettext '$APP_LONG_NAME is already running.'`
    127132         exit 1
    128 @@ -1046,9 +997,6 @@
     133@@ -1054,9 +1000,6 @@
    129134         # The string passed to eval must handles spaces in paths correctly.
    130135         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"
     
    136141         eval echo `gettext '$APP_LONG_NAME is already running.'`
    137142         exit 1
    138 @@ -1785,7 +1733,7 @@
     143@@ -1793,7 +1736,7 @@
    139144 }
    140145 
     
    145150 
    146151 checkifstartingasroot() {
    147 @@ -1793,7 +1741,7 @@
     152@@ -1801,7 +1744,7 @@
    148153         echo "`gettext 'Running I2P as the root user is *not* recommended.'`"
    149154         showsetusermesg
     
    154159     fi
    155160 }
    156 @@ -1858,23 +1806,9 @@
     161@@ -1866,23 +1809,9 @@
    157162             status
    158163             ;;
Note: See TracChangeset for help on using the changeset viewer.