AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i2prouter: - note FBSD10 workaround in ticket #1118

Browse Source 
- remove tanuki's script version checks
This commit is contained in:
kytv
2014-02-11 01:54:45 +00:00
parent 6af82f2a9a
commit d8fef53aef
2 changed files with 91 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
installer/resources/i2prouter
View File

@@ -199,25 +199,46 @@ unsupported() {
echo
}
freebsd10() {
echo
echo "The current version of the Tanuki wrapper does not"
echo "support FreeBSD 10."
echo
echo "See https://trac.i2p2.de/ticket/1118 for more information"
echo "and a workaround for this issue."
echo
echo "In the meantime, you may start I2P by running the script"
echo "${I2P}/runplain.sh"
echo
}
failed() {
echo "**`gettext 'Failed to load the wrapper'`**"
case `uname -s` in
FreeBSD)
# We should never get here on recent versions of FreeBSD
if ! $(pkg_info -E 'libiconv*' > /dev/null 2>&1); then
echo
echo "The wrapper requires libiconv."
echo
echo "It can be installed with pkg_add -r libiconv"
echo
fi
;;
*)
echo
unsupported
;;
esac
exit 1
echo "**`gettext 'Failed to load the wrapper'`**"
case `uname -s` in
FreeBSD)
case `uname -r` in
10*|11*)
freebsd10
;;
*)
# We should never get here on recent versions of FreeBSD
if ! $(pkg_info -E 'libiconv*' > /dev/null 2>&1); then
echo
echo "The wrapper requires libiconv."
echo
echo "It can be installed with pkg_add -r libiconv"
echo
fi
;;
esac
;;
*)
echo
unsupported
;;
esac
exit 1
}
if $(which ldd > /dev/null 2>&1); then
@@ -919,8 +940,8 @@ launchdinternal() {
create_config_dir
# The string passed to eval must handles spaces in paths correctly.
COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP wrapper.script.version=3.5.22 $ADDITIONAL_PARA"
eval $COMMAND_LINE
COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP $ADDITIONAL_PARA"
eval $COMMAND_LINE || failed
else
eval echo `gettext '$APP_LONG_NAME is already running.'`
exit 1
@@ -943,7 +964,7 @@ console() {
create_config_dir
# 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.22 $ADDITIONAL_PARA"
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"
eval $COMMAND_LINE || failed
else
eval echo `gettext '$APP_LONG_NAME is already running.'`
@@ -1066,8 +1087,8 @@ start() {
create_config_dir
# 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.22 $ADDITIONAL_PARA"
eval $COMMAND_LINE
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"
eval $COMMAND_LINE || failed
else
eval echo `gettext '$APP_LONG_NAME is already running.'`
exit 1