Changeset d8fef53


Ignore:
Timestamp:
Feb 11, 2014 1:54:45 AM (6 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
8b946bb, 8ed34e3
Parents:
6af82f2
Message:

i2prouter: - note FBSD10 workaround in ticket #1118

  • remove tanuki's script version checks
Files:
2 edited

Legend:

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

    r6af82f2 rd8fef53  
    7272 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
    7373 #  nice is only used if a priority is specified.
    74 @@ -167,69 +158,13 @@
    75  
    76  # Do not modify anything beyond this point
    77  #-----------------------------------------------------------------------------
    78 +JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF")
    79 +
    80  if [ ! -e "$WRAPPER_CONF" ]; then
    81         echo "Starting I2P Failed: Unable to find $WRAPPER_CONF"
     74@@ -172,84 +163,8 @@
    8275        exit 1
    8376 fi
    8477 
    8578-# Workaround for Gentoo
    86 -JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF")
    87 -
     79 JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF")
     80 
    8881-if [ -e /etc/gentoo-release ]; then
    8982-    if [ $JAVABINARY = java ]; then
     
    110103-}
    111104-
     105-freebsd10() {
     106-    echo
     107-    echo "The current version of the Tanuki wrapper does not"
     108-    echo "support FreeBSD 10."
     109-    echo
     110-    echo "See https://trac.i2p2.de/ticket/1118 for more information"
     111-    echo "and a workaround for this issue."
     112-    echo
     113-    echo "In the meantime, you may start I2P by running the script"
     114-    echo "${I2P}/runplain.sh"
     115-    echo
     116-}
     117-
    112118-failed() {
    113 -        echo "**`gettext 'Failed to load the wrapper'`**"
    114 -        case `uname -s` in
    115 -             FreeBSD)
    116 -                # We should never get here on recent versions of FreeBSD
    117 -                if ! $(pkg_info -E 'libiconv*' > /dev/null 2>&1); then
    118 -                    echo
    119 -                    echo "The wrapper requires libiconv."
    120 -                    echo
    121 -                    echo "It can be installed with pkg_add -r libiconv"
    122 -                    echo
    123 -                fi
    124 -                ;;
    125 -             *)
    126 -                echo
    127 -                unsupported
    128 -                ;;
    129 -        esac
    130 -        exit 1
     119-    echo "**`gettext 'Failed to load the wrapper'`**"
     120-    case `uname -s` in
     121-        FreeBSD)
     122-            case `uname -r` in
     123-                10*|11*)
     124-                    freebsd10
     125-                    ;;
     126-                *)
     127-                    # We should never get here on recent versions of FreeBSD
     128-                    if ! $(pkg_info -E 'libiconv*' > /dev/null 2>&1); then
     129-                        echo
     130-                        echo "The wrapper requires libiconv."
     131-                        echo
     132-                        echo "It can be installed with pkg_add -r libiconv"
     133-                        echo
     134-                    fi
     135-                    ;;
     136-            esac
     137-            ;;
     138-
     139-        *)
     140-            echo
     141-            unsupported
     142-            ;;
     143-    esac
     144-    exit 1
    131145-}
    132146-
     
    140154-    fi
    141155-fi
    142 -
     156 
    143157 if [ -n "$FIXED_COMMAND" ]
    144158 then
    145      COMMAND="$FIXED_COMMAND"
    146 @@ -944,7 +879,7 @@
    147  
    148          # The string passed to eval must handles spaces in paths correctly.
    149          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"
    150 -        eval $COMMAND_LINE || failed
    151 +        eval $COMMAND_LINE
    152      else
    153          eval echo `gettext '$APP_LONG_NAME is already running.'`
    154          exit 1
    155 @@ -1001,7 +936,6 @@
     159@@ -1022,7 +937,6 @@
    156160         if [ "X$pid" = "X" ]
    157161         then
     
    161165             eval echo ' running: PID:$pid'
    162166         fi
    163 @@ -1804,7 +1738,7 @@
     167@@ -1825,7 +1739,7 @@
    164168 }
    165169 
     
    170174 
    171175 checkifstartingasroot() {
    172 @@ -1812,7 +1746,7 @@
     176@@ -1833,7 +1747,7 @@
    173177         echo "`gettext 'Running I2P as the root user is *not* recommended.'`"
    174178         showsetusermesg
     
    179183     fi
    180184 }
    181 @@ -1877,24 +1811,10 @@
     185@@ -1898,24 +1812,10 @@
    182186             status
    183187             ;;
  • installer/resources/i2prouter

    r6af82f2 rd8fef53  
    200200}
    201201
     202freebsd10() {
     203    echo
     204    echo "The current version of the Tanuki wrapper does not"
     205    echo "support FreeBSD 10."
     206    echo
     207    echo "See https://trac.i2p2.de/ticket/1118 for more information"
     208    echo "and a workaround for this issue."
     209    echo
     210    echo "In the meantime, you may start I2P by running the script"
     211    echo "${I2P}/runplain.sh"
     212    echo
     213}
     214
    202215failed() {
    203         echo "**`gettext 'Failed to load the wrapper'`**"
    204         case `uname -s` in
    205              FreeBSD)
    206                 # We should never get here on recent versions of FreeBSD
    207                 if ! $(pkg_info -E 'libiconv*' > /dev/null 2>&1); then
    208                     echo
    209                     echo "The wrapper requires libiconv."
    210                     echo
    211                     echo "It can be installed with pkg_add -r libiconv"
    212                     echo
    213                 fi
    214                 ;;
    215              *)
    216                 echo
    217                 unsupported
    218                 ;;
    219         esac
    220         exit 1
     216    echo "**`gettext 'Failed to load the wrapper'`**"
     217    case `uname -s` in
     218        FreeBSD)
     219            case `uname -r` in
     220                10*|11*)
     221                    freebsd10
     222                    ;;
     223                *)
     224                    # We should never get here on recent versions of FreeBSD
     225                    if ! $(pkg_info -E 'libiconv*' > /dev/null 2>&1); then
     226                        echo
     227                        echo "The wrapper requires libiconv."
     228                        echo
     229                        echo "It can be installed with pkg_add -r libiconv"
     230                        echo
     231                    fi
     232                    ;;
     233            esac
     234            ;;
     235
     236        *)
     237            echo
     238            unsupported
     239            ;;
     240    esac
     241    exit 1
    221242}
    222243
     
    920941
    921942        # The string passed to eval must handles spaces in paths correctly.
    922         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"
    923         eval $COMMAND_LINE
     943        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"
     944        eval $COMMAND_LINE || failed
    924945    else
    925946        eval echo `gettext '$APP_LONG_NAME is already running.'`
     
    944965
    945966        # The string passed to eval must handles spaces in paths correctly.
    946         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"
     967        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"
    947968        eval $COMMAND_LINE || failed
    948969    else
     
    10671088
    10681089        # The string passed to eval must handles spaces in paths correctly.
    1069         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"
    1070         eval $COMMAND_LINE
     1090        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"
     1091        eval $COMMAND_LINE || failed
    10711092    else
    10721093        eval echo `gettext '$APP_LONG_NAME is already running.'`
Note: See TracChangeset for help on using the changeset viewer.