Changeset 2b79da5c


Ignore:
Timestamp:
Aug 4, 2012 5:44:09 PM (8 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
442897b, 4efa87d
Parents:
cc3a8e5
Message:

Debian: update patch to compensate for last commit

At the same time I'm making more Debian-specific changes, such as

  • not checking for Gentoo (this is obviously never going to be true :P)
  • not mentioning IzPack? replacing variables (also not applicable)
  • inform about dpkg-reconfigure i2p in the event someone tries to remove or install an initscript with "i2prouter install|remove|uninstall"
  • remove the manual wrapper instructions
File:
1 edited

Legend:

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

    rcc3a8e5 r2b79da5c  
    99Debian wrapper.config to try to prevent confusion.
    1010---
    11  installer/resources/eepget         |    2 +-
    12  installer/resources/i2prouter      |    8 ++++----
    13  installer/resources/runplain.sh    |    6 +++---
    14  installer/resources/wrapper.config |   17 ++++++++---------
    15  4 files changed, 16 insertions(+), 17 deletions(-)
    1611
    1712--- a/installer/resources/eepget
     
    2419--- a/installer/resources/i2prouter
    2520+++ b/installer/resources/i2prouter
    26 @@ -55,8 +55,8 @@
     21@@ -10,7 +10,7 @@
     22 # wrapper configuration file.
     23 #
     24 # If this script fails to successfully invoke i2psvc on your platform,
     25-# try the runplain.sh script instead.
     26+# try the i2prouter-nowrapper script instead.
     27 #
     28 # This software is the proprietary information of Tanuki Software.
     29 # You shall use it only in accordance with the terms of the
     30@@ -24,16 +24,9 @@
     31 # These settings can be modified to fit the needs of your application
     32 # Optimized for use with version 3.5.14 of the Wrapper.
     33 
     34-# Paths
     35-# Note that (percent)INSTALL_PATH, (percent)USER_HOME,  and (percent)SYSTEM_java_io_tmpdir
     36-# should have been replaced by the izpack installer.
     37-# If you did not run the installer, replace them with the appropriate paths.
     38-I2P="%INSTALL_PATH"
     39-I2P_CONFIG_DIR="%USER_HOME/.i2p"
     40-I2PTEMP="%SYSTEM_java_io_tmpdir"
     41-# PORTABLE installation:
     42-# Use the following instead.
     43-#I2PTEMP="%INSTALL_PATH"
     44+I2P="/usr/share/i2p"
     45+I2P_CONFIG_DIR="$HOME/.i2p"
     46+I2PTEMP="/tmp"
     47 
     48 # Application
     49 APP_NAME="i2p"
     50@@ -55,8 +48,8 @@
    2751 #RUN_AS_USER=
    2852 
     
    3559 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
    3660 #  nice is only used if a priority is specified.
     61@@ -167,48 +160,6 @@
     62 # Workaround for Gentoo
     63 JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF")
     64 
     65-if [ -e /etc/gentoo-release ]; then
     66-    if [ $JAVABINARY = java ]; then
     67-        if [ -x /etc/java-config-2/current-system-vm/bin/java ]; then
     68-            JAVABINARY="/etc/java-config-2/current-system-vm/bin/java"
     69-        else
     70-            echo "Please set wrapper.java.command in $WRAPPER_CONF"
     71-            exit 1
     72-        fi
     73-    fi
     74-fi
     75-
     76-WRAPPER_URL="http://www.i2p2.de/manualwrapper"
     77-unsupported() {
     78-    echo "The most likely reason is that a supported version of the java"
     79-    echo "wrapper is not available in the I2P installation package for your"
     80-    echo "platform. It may be possible to manually download and install"
     81-    echo "a compatible wrapper for your system."
     82-    echo "See ${WRAPPER_URL} for hints."
     83-    echo
     84-    echo "In the meantime, you may start I2P by running the script"
     85-    echo "${I2P}/runplain.sh"
     86-    echo
     87-}
     88-
     89-failed() {
     90-        echo "**Failed to load the wrapper**"
     91-        case `uname -s` in
     92-             FreeBSD)
     93-                echo
     94-                echo "The wrapper requires libiconv to be on your system."
     95-                echo "It can be installed with pkg_add -r libiconv"
     96-                echo
     97-                exit 1
     98-                ;;
     99-             *)
     100-                echo
     101-                unsupported
     102-                exit 1
     103-                ;;
     104-        esac
     105-}
     106-
     107 if [ -n "$FIXED_COMMAND" ]
     108 then
     109     COMMAND="$FIXED_COMMAND"
     110@@ -899,9 +850,6 @@
     111         # The string passed to eval must handles spaces in paths correctly.
     112         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"
     113         eval $COMMAND_LINE
     114-        if [ "$?" -ne "0" ]; then
     115-                failed
     116-        fi
     117     else
     118         eval echo `gettext '$APP_LONG_NAME is already running.'`
     119         exit 1
     120@@ -1025,9 +973,6 @@
     121         # The string passed to eval must handles spaces in paths correctly.
     122         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"
     123         eval $COMMAND_LINE
     124-        if [ "$?" -ne "0" ]; then
     125-                failed
     126-        fi
     127     else
     128         eval echo `gettext '$APP_LONG_NAME is already running.'`
     129         exit 1
     130@@ -1798,16 +1743,8 @@
     131             status
     132             ;;
     133 
     134-        'install')
     135-            installdaemon
     136-            if [ ! `grep ^RUN_AS_USER $0` ]; then
     137-                 showsetusermesg
     138-            fi
     139-
     140-            ;;
     141-
     142-        'remove' | 'uninstall')
     143-            removedaemon
     144+        'install' | 'remove' | 'uninstall')
     145+            echo "Use \"dpkg-reconfigure i2p\" to configure the initscript."
     146             ;;
     147 
     148         'dump')
    37149--- a/installer/resources/runplain.sh
    38150+++ b/installer/resources/runplain.sh
Note: See TracChangeset for help on using the changeset viewer.