debian: read /etc/default/i2p in /usr/bin/i2prouter

This will allow overrides to be set without editing /usr/bin/i2prouter.

i2prouter may be replaced during upgrades. /etc/default/i2p will only be
changed by debconf (e.g. "dpkg-reconfigure i2p").

debian/changelog

@@ -1,6 +1,7 @@
 i2p (0.9.6-1) unstable; urgency=low
 
   * New upstream release
+  * i2prouter: allow overrides to be set in /etc/default/i2p
 
  -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 27 May 2013 00:00:00 +0000
 

debian/patches/0001-path-substitution.patch

@@ -32,7 +32,7 @@ Debian wrapper.config to try to prevent confusion.
  #
  # This software is the proprietary information of Tanuki Software.
  # You shall use it only in accordance with the terms of the
-@@ -24,16 +24,9 @@
+@@ -24,16 +24,12 @@
  # These settings can be modified to fit the needs of your application
  # Optimized for use with version 3.5.17 of the Wrapper.
  
@@ -46,13 +46,16 @@ Debian wrapper.config to try to prevent confusion.
 -# PORTABLE installation:
 -# Use the following instead.
 -#I2PTEMP="%INSTALL_PATH"
++# Read config file if found
++[ -f /etc/default/i2p ] && . /etc/default/i2p
++
 +I2P="/usr/share/i2p"
 +I2P_CONFIG_DIR="$HOME/.i2p"
 +I2PTEMP="/tmp"
  
  # Application
  APP_NAME="i2p"
-@@ -61,8 +54,8 @@
+@@ -61,8 +57,8 @@
  #RUN_AS_USER=
  
  # Wrapper
@@ -63,7 +66,7 @@ Debian wrapper.config to try to prevent confusion.
  
  # Priority at which to run the wrapper.  See "man nice" for valid priorities.
  #  nice is only used if a priority is specified.
-@@ -167,48 +160,6 @@
+@@ -167,48 +163,6 @@
  # Workaround for Gentoo
  JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF")
  
@@ -112,7 +115,7 @@ Debian wrapper.config to try to prevent confusion.
  if [ -n "$FIXED_COMMAND" ]
  then
      COMMAND="$FIXED_COMMAND"
-@@ -920,9 +871,6 @@
+@@ -920,9 +874,6 @@
          # The string passed to eval must handles spaces in paths correctly.
          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"
          eval $COMMAND_LINE
@@ -122,7 +125,7 @@ Debian wrapper.config to try to prevent confusion.
      else
          eval echo `gettext '$APP_LONG_NAME is already running.'`
          exit 1
-@@ -1046,9 +994,6 @@
+@@ -1046,9 +997,6 @@
          # The string passed to eval must handles spaces in paths correctly.
          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"
          eval $COMMAND_LINE
@@ -132,7 +135,25 @@ Debian wrapper.config to try to prevent confusion.
      else
          eval echo `gettext '$APP_LONG_NAME is already running.'`
          exit 1
-@@ -1858,24 +1803,9 @@
+@@ -1785,7 +1733,7 @@
+ }
+ 
+ showsetusermesg()  {
+-    echo "`gettext 'Please edit i2prouter and set the variable RUN_AS_USER'`."
++    echo "`gettext 'Please edit /etc/default/i2p and set the variable RUN_AS_USER'`."
+ }
+ 
+ checkifstartingasroot() {
+@@ -1793,7 +1741,7 @@
+         echo "`gettext 'Running I2P as the root user is *not* recommended.'`"
+         showsetusermesg
+         echo
+-        echo "`gettext 'To run as root anyway, edit i2prouter and set ALLOW_ROOT=true.'`"
++        echo "`gettext 'To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true.'`"
+         exit 1
+     fi
+ }
+@@ -1858,24 +1806,9 @@
              status
              ;;
  
@@ -298,3 +319,116 @@ Debian wrapper.config to try to prevent confusion.
 -# Allow the service to interact with the desktop.
 -wrapper.ntservice.interactive=false
 -
+--- a/installer/resources/locale/po/messages_de.po
++++ b/installer/resources/locale/po/messages_de.po
+@@ -192,14 +192,14 @@
+ msgstr "Falls gestartet, fordere einen Java Thread dump an"
+ 
+ #: ../i2prouter:1788
+-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
+-msgstr "Bitte bearbeite i2prouter und setze die Variable RUN_AS_USER"
++msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
++msgstr "Bitte bearbeite /etc/default/i2p und setze die Variable RUN_AS_USER"
+ 
+ #: ../i2prouter:1793
+ msgid "Running I2P as the root user is *not* recommended."
+ msgstr "I2P als root Benutzer auszuführen ist *nicht* empfehlenswert."
+ 
+ #: ../i2prouter:1796
+-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
++msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
+ msgstr ""
+-"Um I2P trotzdem als root auszuführen bearbeite i2prouter und setze ALLOW_ROOT=true."
++"Um I2P trotzdem als root auszuführen bearbeite /etc/default/i2p und setze ALLOW_ROOT=true."
+--- a/installer/resources/locale/po/messages_en.po
++++ b/installer/resources/locale/po/messages_en.po
+@@ -185,7 +185,7 @@
+ msgstr ""
+ 
+ #: ../i2prouter:1788
+-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
++msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
+ msgstr ""
+ 
+ #: ../i2prouter:1793
+@@ -193,5 +193,5 @@
+ msgstr ""
+ 
+ #: ../i2prouter:1796
+-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
++msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
+ msgstr ""
+--- a/installer/resources/locale/po/messages_fr.po
++++ b/installer/resources/locale/po/messages_fr.po
+@@ -187,7 +187,7 @@
+ msgstr ""
+ 
+ #: ../i2prouter:1780
+-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
++msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
+ msgstr ""
+ 
+ #: ../i2prouter:1785
+@@ -196,5 +196,5 @@
+ "Faire fonctionner I2P en tant qu'utilisateur root n'est *pas* recommandé."
+ 
+ #: ../i2prouter:1788
+-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
++msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
+ msgstr ""
+--- a/installer/resources/locale/po/messages_it.po
++++ b/installer/resources/locale/po/messages_it.po
+@@ -187,7 +187,7 @@
+ msgstr ""
+ 
+ #: ../i2prouter:1780
+-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
++msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
+ msgstr ""
+ 
+ #: ../i2prouter:1785
+@@ -195,5 +195,5 @@
+ msgstr ""
+ 
+ #: ../i2prouter:1788
+-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
++msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
+ msgstr ""
+--- a/installer/resources/locale/po/messages_ru.po
++++ b/installer/resources/locale/po/messages_ru.po
+@@ -188,7 +188,7 @@
+ msgstr ""
+ 
+ #: ../i2prouter:1780
+-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
++msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
+ msgstr ""
+ 
+ #: ../i2prouter:1785
+@@ -196,5 +196,5 @@
+ msgstr ""
+ 
+ #: ../i2prouter:1788
+-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
++msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
+ msgstr ""
+--- a/installer/resources/locale/po/messages_sv.po
++++ b/installer/resources/locale/po/messages_sv.po
+@@ -187,13 +187,13 @@
+ msgstr "Fråga efter en Java thread dump vid drift."
+ 
+ #: ../i2prouter:1780
+-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
+-msgstr "Var god ändra i2prouter och sätt variabeln RUN_AS_USER"
++msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
++msgstr "Var god ändra /etc/default/i2p och sätt variabeln RUN_AS_USER"
+ 
+ #: ../i2prouter:1785
+ msgid "Running I2P as the root user is *not* recommended."
+ msgstr "Att köra I2P som användare root är *inte* rekommenderat."
+ 
+ #: ../i2prouter:1788
+-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
+-msgstr "För att köra som root iallafall, ändra i2prouter och sätt ALLOW_ROOT=true"
++msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
++msgstr "För att köra som root iallafall, ändra /etc/default/i2p och sätt ALLOW_ROOT=true"