source:
debian/patches/0001-path-substitution.patch
@
2902a708
Last change on this file since 2902a708 was 2902a708, checked in by , 8 years ago | |
---|---|
|
|
File size: 18.9 KB |
-
installer/resources/eepget
From: Kill Your TV <killyourtv@i2pmail.org> Date: Mon, 18 Apr 2011 16:43:40 +0000 Subject: path substitution The purpose of this patch is the change the values handled by the Izpack based installer. Non-applicable sections (e.g., portable & windows) are also removed for the Debian wrapper.config to try to prevent confusion. --- installer/resources/eepget | 2 +- installer/resources/i2prouter | 82 ++++-------------------------------- installer/resources/runplain.sh | 4 +- installer/resources/wrapper.config | 70 ++++++------------------------ 4 files changed, 24 insertions(+), 134 deletions(-)
a b 1 1 #!/bin/sh 2 I2P=" %INSTALL_PATH"2 I2P="/usr/share/i2p" 3 3 java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@" -
installer/resources/i2prouter
a b 10 10 # wrapper configuration file. 11 11 # 12 12 # If this script fails to successfully invoke i2psvc on your platform, 13 # try the runplain.shscript instead.13 # try the i2prouter-nowrapper script instead. 14 14 # 15 15 # This software is the proprietary information of Tanuki Software. 16 16 # You shall use it only in accordance with the terms of the … … 24 24 # These settings can be modified to fit the needs of your application 25 25 # Optimized for use with version 3.5.19 of the Wrapper. 26 26 27 # Paths 28 # Note that (percent)INSTALL_PATH, (percent)USER_HOME, and (percent)SYSTEM_java_io_tmpdir 29 # should have been replaced by the izpack installer. 30 # If you did not run the installer, replace them with the appropriate paths. 31 I2P="%INSTALL_PATH" 32 if [ "`uname -s`" == "Darwin" ]; then 33 if [ -d "%USER_HOME/Library/Application Support" ]; then 34 I2P_CONFIG_DIR="%USER_HOME/Library/Application Support/i2p" 35 else 36 I2P_CONFIG_DIR="%USER_HOME/.i2p" 37 fi 38 else 39 I2P_CONFIG_DIR="%USER_HOME/.i2p" 40 fi 41 I2PTEMP="%SYSTEM_java_io_tmpdir" 27 # Read config file if found 28 [ -f /etc/default/i2p ] && . /etc/default/i2p 29 30 I2P="/usr/share/i2p" 31 I2P_CONFIG_DIR="$HOME/.i2p" 32 I2PTEMP="/tmp" 42 33 # PORTABLE installation: 43 34 # Use the following instead. 44 35 #I2PTEMP="%INSTALL_PATH" … … 69 60 #RUN_AS_USER= 70 61 71 62 # Wrapper 72 WRAPPER_CMD=" $I2P/i2psvc"73 WRAPPER_CONF=" $I2P/wrapper.config"63 WRAPPER_CMD="/usr/sbin/wrapper" 64 WRAPPER_CONF="/etc/i2p/wrapper.config" 74 65 75 66 # Priority at which to run the wrapper. See "man nice" for valid priorities. 76 67 # nice is only used if a priority is specified. … … 175 166 # Workaround for Gentoo 176 167 JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF") 177 168 178 if [ -e /etc/gentoo-release ]; then179 if [ $JAVABINARY = java ]; then180 if [ -x /etc/java-config-2/current-system-vm/bin/java ]; then181 JAVABINARY="/etc/java-config-2/current-system-vm/bin/java"182 else183 echo "Please set wrapper.java.command in $WRAPPER_CONF"184 exit 1185 fi186 fi187 fi188 189 WRAPPER_URL="http://www.i2p2.de/manualwrapper"190 unsupported() {191 echo "The most likely reason is that a supported version of the java"192 echo "wrapper is not available in the I2P installation package for your"193 echo "platform. It may be possible to manually download and install"194 echo "a compatible wrapper for your system."195 echo "See ${WRAPPER_URL} for hints."196 echo197 echo "In the meantime, you may start I2P by running the script"198 echo "${I2P}/runplain.sh"199 echo200 }201 202 failed() {203 echo "**`gettext 'Failed to load the wrapper'`**"204 case `uname -s` in205 FreeBSD)206 echo207 echo "The wrapper requires libiconv to be on your system."208 echo "It can be installed with pkg_add -r libiconv"209 echo210 exit 1211 ;;212 *)213 echo214 unsupported215 exit 1216 ;;217 esac218 }219 220 169 if [ -n "$FIXED_COMMAND" ] 221 170 then 222 171 COMMAND="$FIXED_COMMAND" … … 928 877 # The string passed to eval must handles spaces in paths correctly. 929 878 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.19 $ADDITIONAL_PARA" 930 879 eval $COMMAND_LINE 931 if [ "$?" -ne "0" ]; then932 failed933 fi934 880 else 935 881 eval echo `gettext '$APP_LONG_NAME is already running.'` 936 882 exit 1 … … 1054 1000 # The string passed to eval must handles spaces in paths correctly. 1055 1001 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.19 $ADDITIONAL_PARA" 1056 1002 eval $COMMAND_LINE 1057 if [ "$?" -ne "0" ]; then1058 failed1059 fi1060 1003 else 1061 1004 eval echo `gettext '$APP_LONG_NAME is already running.'` 1062 1005 exit 1 … … 1793 1736 } 1794 1737 1795 1738 showsetusermesg() { 1796 echo "`gettext 'Please edit i2prouterand set the variable RUN_AS_USER'`."1739 echo "`gettext 'Please edit /etc/default/i2p and set the variable RUN_AS_USER'`." 1797 1740 } 1798 1741 1799 1742 checkifstartingasroot() { … … 1801 1744 echo "`gettext 'Running I2P as the root user is *not* recommended.'`" 1802 1745 showsetusermesg 1803 1746 echo 1804 echo "`gettext 'To run as root anyway, edit i2prouterand set ALLOW_ROOT=true.'`"1747 echo "`gettext 'To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true.'`" 1805 1748 exit 1 1806 1749 fi 1807 1750 } … … 1866 1809 status 1867 1810 ;; 1868 1811 1869 'install') 1870 installdaemon 1871 if [ ! `grep ^RUN_AS_USER $0` ]; then 1872 echo 1873 showsetusermesg 1874 fi 1875 echo 1876 echo "You may want to disable the browser from launching at startup at" 1877 echo "http://127.0.0.1:7657/configclients" 1878 echo 1879 echo "I2P_CONFIG_DIR is currently set to $I2P_CONFIG_DIR." 1880 echo "Change the value in $0 if this is not" 1881 echo "appropriate for your configuration." 1882 ;; 1883 1884 'remove' | 'uninstall') 1885 removedaemon 1886 ;; 1812 'install' | 'remove' | 'uninstall') 1813 echo "Use \"dpkg-reconfigure i2p\" to configure the initscript." 1814 exit 1 1815 ;; 1887 1816 1888 1817 'dump') 1889 1818 checkUser "" "$COMMAND" -
installer/resources/runplain.sh
a b 11 11 # Note that (percent)INSTALL_PATH and (percent)SYSTEM_java_io_tmpdir 12 12 # should have been replaced by the izpack installer. 13 13 # If you did not run the installer, replace them with the appropriate path. 14 I2P=" %INSTALL_PATH"15 I2PTEMP=" %SYSTEM_java_io_tmpdir"14 I2P="/usr/share/i2p" 15 I2PTEMP="/tmp" 16 16 17 17 # Having IPv6 enabled can cause problems with certain configurations. Changing the 18 18 # next value to true may help. -
installer/resources/wrapper.config
a b 8 8 # click "Shutdown", wait 11 minutes, then start i2p. 9 9 # 10 10 # WARNING - The wrapper is NOT run (and this file is not used) 11 # if you start I2P with the 'no window' icon on Windows, or 12 # with the runplain.sh script on Linux. Use the 'restartable' 13 # icon on Windows or the i2prouter script on Linux to run the wrapper. 11 # if you start I2P with the i2prouter-nowrapper script in Linux. 12 # Use i2prouter or the initscript to run the wrapper. 14 13 # 15 14 # NOTE - Directory organization: 16 15 # The standard I2P Installation will set up a "split" directory structure 17 16 # with code in the install directory, data and configuration files in the 18 17 # user's home directory, and temporary files in the system temporary directory. 19 # To set up a single-directory "portable" installation suitable for20 # a USB stick, make several changes specified below (search for PORTABLE).21 #22 # NOTE - The izpack installer performs variable subsitiution on this23 # file upon installation. If you did not use izpack, you must24 # find and replace all instances of (dollar)INSTALL_PATH and25 # (dollar)SYSTEM_java_io_tmpdir with appropriate values26 # (perhaps . and /var/tmp, respectively)27 18 # 28 19 #******************************************************************** 29 20 # Java Application … … 60 51 # classes, or all the classes of i2p.jar, are in a different directory). 61 52 # Be sure there are no other duplicate classes. 62 53 # 63 wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar 54 wrapper.java.classpath.1=/usr/share/i2p/lib/*.jar 55 wrapper.java.classpath.2=/usr/share/java/wrapper.jar 64 56 # uncomment this to use the system classpath as well (e.g. to get tools.jar) 65 # wrapper.java.classpath. 2=%CLASSPATH%57 # wrapper.java.classpath.3=%CLASSPATH% 66 58 67 # Java Library Path (location of Wrapper.DLL or libwrapper.so)68 wrapper.java.library.path.1= $INSTALL_PATH69 wrapper.java.library.path.2= $INSTALL_PATH/lib59 # Java Library Path (location of libjbigi/libjcpuid) 60 wrapper.java.library.path.1=/usr/lib/jni 61 wrapper.java.library.path.2=/usr/share/java/lib 70 62 71 63 # Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode. 72 64 wrapper.java.additional.auto_bits=TRUE … … 76 68 wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt 77 69 wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true 78 70 wrapper.java.additional.3=-Dorg.mortbay.xml.XmlParser.NotValidating=true 79 wrapper.java.additional.4=-Di2p.dir.base= "$INSTALL_PATH"71 wrapper.java.additional.4=-Di2p.dir.base=/usr/share/i2p 80 72 wrapper.java.additional.4.stripquotes=TRUE 81 73 82 74 # On some IPv6 enabled systems, I2P and other network-enabled java applications … … 143 135 # You may wish to change this. 144 136 # NOTE: On Linux/Mac this is overridden in the i2prouter script; changes here will have no effect. 145 137 # System temp directory: 146 wrapper.logfile=$SYSTEM_java_io_tmpdir/wrapper.log 147 # PORTABLE installation: 148 # Use the following instead. I2P will find the logfile here, 149 # no need for a wrapper.java.additional line too. 150 #wrapper.logfile=$INSTALL_PATH/wrapper.log 138 #wrapper.logfile=/tmp/wrapper.log 151 139 152 140 # Format of output for the log file. 153 141 # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread, … … 217 205 # Linux/Mac users, do not set here, see settings in the i2prouter script. 218 206 # Directory must exist or the wrapper will fail to start. 219 207 # System temp directory: 220 #wrapper.java.pidfile=$SYSTEM_java_io_tmpdir/routerjvm.pid 221 # PORTABLE installation: 222 # Use the following instead. 223 #wrapper.java.pidfile=$INSTALL_PATH/routerjvm.pid 224 # pid file for the service monitoring the JVM 208 #wrapper.java.pidfile=/tmp/routerjvm.pid 225 209 # 226 210 # From i2prouter: 227 211 # … … 235 219 # Linux/Mac users, do not set here, see settings in the i2prouter script. 236 220 # Directory must exist or the wrapper will fail to start. 237 221 # System temp directory: 238 #wrapper.pidfile=$SYSTEM_java_io_tmpdir/i2p.pid 239 # PORTABLE installation: 240 # Use the following instead. 241 #wrapper.pidfile=$INSTALL_PATH/i2p.pid 222 #wrapper.pidfile=/tmp/i2p.pid 242 223 243 224 #******************************************************************** 244 225 # Wrapper General Properties … … 255 236 wrapper.umask=0022 256 237 wrapper.java.umask=0022 257 238 wrapper.logfile.umask=077 258 259 #********************************************************************260 # Wrapper NT Service Properties261 #********************************************************************262 # WARNING - Do not modify any of these properties when an application263 # using this configuration file has been installed as a service.264 # Please uninstall the service before modifying this section. The265 # service can then be reinstalled.266 267 # Name of the service268 wrapper.ntservice.name=i2p269 270 # Display name of the service271 wrapper.ntservice.displayname=I2P Service272 273 # Description of the service274 wrapper.ntservice.description=The I2P router service275 276 # Service dependencies. Add dependencies as needed starting from 1277 wrapper.ntservice.dependency.1=278 279 # Mode in which the service is installed. AUTO_START or DEMAND_START280 wrapper.ntservice.starttype=AUTO_START281 282 # Allow the service to interact with the desktop.283 wrapper.ntservice.interactive=false284 -
installer/resources/locale/po/messages_de.po
a b 192 192 msgstr "Falls gestartet, fordere einen Java Thread dump an" 193 193 194 194 #: ../i2prouter:1788 195 msgid "Please edit i2prouterand set the variable RUN_AS_USER"196 msgstr "Bitte bearbeite i2prouterund setze die Variable RUN_AS_USER"195 msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" 196 msgstr "Bitte bearbeite /etc/default/i2p und setze die Variable RUN_AS_USER" 197 197 198 198 #: ../i2prouter:1793 199 199 msgid "Running I2P as the root user is *not* recommended." 200 200 msgstr "I2P als root Benutzer auszuführen ist *nicht* empfehlenswert." 201 201 202 202 #: ../i2prouter:1796 203 msgid "To run as root anyway, edit i2prouterand set ALLOW_ROOT=true."203 msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." 204 204 msgstr "" 205 "Um I2P trotzdem als root auszuführen bearbeite i2prouterund setze ALLOW_ROOT=true."205 "Um I2P trotzdem als root auszuführen bearbeite /etc/default/i2p und setze ALLOW_ROOT=true." -
installer/resources/locale/po/messages_en.po
a b 185 185 msgstr "" 186 186 187 187 #: ../i2prouter:1796 188 msgid "Please edit i2prouterand set the variable RUN_AS_USER"188 msgid "Please edit /etc/defalt/i2p and set the variable RUN_AS_USER" 189 189 msgstr "" 190 190 191 191 #: ../i2prouter:1801 … … 193 193 msgstr "" 194 194 195 195 #: ../i2prouter:1804 196 msgid "To run as root anyway, edit i2prouterand set ALLOW_ROOT=true."196 msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." 197 197 msgstr "" -
installer/resources/locale/po/messages_fr.po
a b 186 186 msgstr "Request a Java thread dump if running." 187 187 188 188 #: ../i2prouter:1788 189 msgid "Please edit i2prouterand set the variable RUN_AS_USER"190 msgstr "Veuillez éditer $0et paramétrer la variable RUN_AS_USER"189 msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" 190 msgstr "Veuillez éditer /etc/default/i2p et paramétrer la variable RUN_AS_USER" 191 191 192 192 #: ../i2prouter:1793 193 193 msgid "Running I2P as the root user is *not* recommended." 194 194 msgstr "Faire fonctionner I2P en tant qu'utilisateur root n'est *pas* recommandé." 195 195 196 196 #: ../i2prouter:1796 197 msgid "To run as root anyway, edit i2prouterand set ALLOW_ROOT=true."198 msgstr "Pour exécuter en tant que root de toute façon, éditer $0et mettre ALLOW_ROOT=true."197 msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." 198 msgstr "Pour exécuter en tant que root de toute façon, éditer /etc/default/i2p et mettre ALLOW_ROOT=true." -
installer/resources/locale/po/messages_it.po
a b 187 187 msgstr "" 188 188 189 189 #: ../i2prouter:1780 190 msgid "Please edit i2prouterand set the variable RUN_AS_USER"190 msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" 191 191 msgstr "" 192 192 193 193 #: ../i2prouter:1785 … … 195 195 msgstr "" 196 196 197 197 #: ../i2prouter:1788 198 msgid "To run as root anyway, edit i2prouterand set ALLOW_ROOT=true."198 msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." 199 199 msgstr "" -
installer/resources/locale/po/messages_ru.po
a b 188 188 msgstr "Запросить дамп нитей Java, если запущено." 189 189 190 190 #: ../i2prouter:1796 191 msgid "Please edit i2prouterand set the variable RUN_AS_USER"191 msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" 192 192 msgstr "" 193 193 194 194 #: ../i2prouter:1801 … … 196 196 msgstr "Запуск I2P от имени root НЕ рекомендовано." 197 197 198 198 #: ../i2prouter:1804 199 msgid "To run as root anyway, edit i2prouterand set ALLOW_ROOT=true."199 msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." 200 200 msgstr "" -
installer/resources/locale/po/messages_sv.po
a b 187 187 msgstr "Fråga efter en Java thread dump vid drift." 188 188 189 189 #: ../i2prouter:1780 190 msgid "Please edit i2prouterand set the variable RUN_AS_USER"191 msgstr "Var god ändra i2prouteroch sätt variabeln RUN_AS_USER"190 msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" 191 msgstr "Var god ändra /etc/default/i2p och sätt variabeln RUN_AS_USER" 192 192 193 193 #: ../i2prouter:1785 194 194 msgid "Running I2P as the root user is *not* recommended." 195 195 msgstr "Att köra I2P som användare root är *inte* rekommenderat." 196 196 197 197 #: ../i2prouter:1788 198 msgid "To run as root anyway, edit i2prouterand set ALLOW_ROOT=true."199 msgstr "För att köra som root iallafall, ändra i2prouteroch sätt ALLOW_ROOT=true"198 msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." 199 msgstr "För att köra som root iallafall, ändra /etc/default/i2p och sätt ALLOW_ROOT=true" -
installer/resources/locale/po/messages_zh.po
a b 187 187 msgstr "请求Java转储(如果在运行)。" 188 188 189 189 #: ../i2prouter:1796 190 msgid "Please edit i2prouterand set the variable RUN_AS_USER"191 msgstr "请编辑 i2prouter设置 RUN_AS_USER 变量"190 msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" 191 msgstr "请编辑 /etc/default/i2p 设置 RUN_AS_USER 变量" 192 192 193 193 #: ../i2prouter:1801 194 194 msgid "Running I2P as the root user is *not* recommended." 195 195 msgstr "推荐 *不要* 以 root 身份运行 I2P 。" 196 196 197 197 #: ../i2prouter:1804 198 msgid "To run as root anyway, edit i2prouterand set ALLOW_ROOT=true."199 msgstr "要以root运行,请编辑 i2prouter并设置 ALLOW_ROOT=true。"198 msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." 199 msgstr "要以root运行,请编辑 /etc/default/i2p 并设置 ALLOW_ROOT=true。" -
installer/resources/locale/po/messages_tr.po
a b 186 186 msgstr "Çalışıyorsa Java iş parçacığı dökümü isteyin." 187 187 188 188 #: ../i2prouter:1796 189 msgid "Please edit i2prouterand set the variable RUN_AS_USER"190 msgstr " i2prouterdosyasını düzenleyin ve RUN_AS_USER değişkenini ayarlayın"189 msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" 190 msgstr "/etc/default/i2p dosyasını düzenleyin ve RUN_AS_USER değişkenini ayarlayın" 191 191 192 192 #: ../i2prouter:1801 193 193 msgid "Running I2P as the root user is *not* recommended." 194 194 msgstr "I2P yazılımının root olarak çalıştırmanız *önerilmez*." 195 195 196 196 #: ../i2prouter:1804 197 msgid "To run as root anyway, edit i2prouterand set ALLOW_ROOT=true."198 msgstr "Root olarak çalıştırmak için i2prouterdosyasını düzenleyin ve ALLOW_ROOT=true ayarını yapın."197 msgid "To run as root anyway, edit /etc/defalt/i2p and set ALLOW_ROOT=true." 198 msgstr "Root olarak çalıştırmak için /etc/default/i2p dosyasını düzenleyin ve ALLOW_ROOT=true ayarını yapın."
Note: See TracBrowser
for help on using the repository browser.