Changeset 65b1124 for debian


Ignore:
Timestamp:
Sep 19, 2013 8:56:56 PM (7 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
c97f0f3
Parents:
ce2d0b0
Message:

various updates to i2prouter

  • check status of i2psvc with ldd
  • only warn about libiconv in FreeBSD if the package isn't installed. In recent versions of FreeBSD, OpenJDK depends on libiconv so it should always be available.
File:
1 edited

Legend:

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

    rce2d0b0 r65b1124  
    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 @@ -175,48 +166,6 @@
    75  # Workaround for Gentoo
    76  JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF")
    77  
     74@@ -172,64 +163,6 @@
     75        exit 1
     76 fi
     77 
     78-# Workaround for Gentoo
     79-JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF")
     80-
    7881-if [ -e /etc/gentoo-release ]; then
    7982-    if [ $JAVABINARY = java ]; then
     
    104107-        case `uname -s` in
    105108-             FreeBSD)
    106 -                echo
    107 -                echo "The wrapper requires libiconv to be on your system."
    108 -                echo "It can be installed with pkg_add -r libiconv"
    109 -                echo
    110 -                exit 1
     109-                # We should never get here on recent versions of FreeBSD
     110-                if ! $(pkg_info -E 'libiconv*' > /dev/null 2>&1); then
     111-                    echo
     112-                    echo "The wrapper requires libiconv."
     113-                    echo
     114-                    echo "It can be installed with pkg_add -r libiconv"
     115-                    echo
     116-                fi
    111117-                ;;
    112118-             *)
    113119-                echo
    114120-                unsupported
    115 -                exit 1
    116121-                ;;
    117122-        esac
     123-        exit 1
    118124-}
     125-
     126-if $(which ldd > /dev/null 2>&1); then
     127-    # This should cover every *NIX other than OSX since OSX doesn't have ldd.
     128-    # OSX has otool. Is otool on every OSX installation? Is otool's output the same as ldd's?
     129-    # The wrapper we ship for OSX are for PPC and Intel, so maybe we don't need to worry about OSX?
     130-    if (ldd "$WRAPPER_CMD" |grep -q 'not found') > /dev/null 2>&1 || \
     131-                         ! (ldd "$WRAPPER_CMD" > /dev/null 2>&1); then
     132-        failed
     133-    fi
     134-fi
    119135-
    120136 if [ -n "$FIXED_COMMAND" ]
    121137 then
    122138     COMMAND="$FIXED_COMMAND"
    123 @@ -928,9 +877,6 @@
     139@@ -940,7 +873,7 @@
     140 
    124141         # The string passed to eval must handles spaces in paths correctly.
    125142         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.20 $ADDITIONAL_PARA"
    126          eval $COMMAND_LINE
    127 -        if [ "$?" -ne "0" ]; then
    128 -                failed
    129 -        fi
     143-        eval $COMMAND_LINE || failed
     144+        eval $COMMAND_LINE
    130145     else
    131146         eval echo `gettext '$APP_LONG_NAME is already running.'`
    132147         exit 1
    133 @@ -1054,9 +1000,6 @@
    134          # The string passed to eval must handles spaces in paths correctly.
    135          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.20 $ADDITIONAL_PARA"
    136          eval $COMMAND_LINE
    137 -        if [ "$?" -ne "0" ]; then
    138 -                failed
    139 -        fi
    140      else
    141          eval echo `gettext '$APP_LONG_NAME is already running.'`
    142          exit 1
    143 @@ -1793,7 +1736,7 @@
     148@@ -997,7 +930,6 @@
     149         if [ "X$pid" = "X" ]
     150         then
     151             eval echo " `gettext 'WARNING: $APP_LONG_NAME may have failed to start.'`"
     152-            failed
     153         else
     154             eval echo ' running: PID:$pid'
     155         fi
     156@@ -1800,7 +1732,7 @@
    144157 }
    145158 
     
    150163 
    151164 checkifstartingasroot() {
    152 @@ -1801,7 +1744,7 @@
     165@@ -1808,7 +1740,7 @@
    153166         echo "`gettext 'Running I2P as the root user is *not* recommended.'`"
    154167         showsetusermesg
     
    159172     fi
    160173 }
    161 @@ -1866,24 +1809,10 @@
     174@@ -1873,24 +1805,10 @@
    162175             status
    163176             ;;
Note: See TracChangeset for help on using the changeset viewer.