Ignore:
Timestamp:
Nov 26, 2011 10:13:07 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
e4004e6
Parents:
f630d2dd (diff), 97ead4c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '0df36c67913504a966d734f799d1bb39bf358396'

and '220f8941ffde39c665c1213cbc27037defb3527f'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • installer/resources/i2prouter

    rf630d2dd r17773a2  
    132132# Do not modify anything beyond this point
    133133#-----------------------------------------------------------------------------
    134 if [ -e $WRAPPER_CONF ]; then
     134if [ ! -e $WRAPPER_CONF ]; then
    135135       echo "Starting I2P Failed: Unable to find $WRAPPER_CONF"
    136136       exit 1
     
    342342    OS_VER=`sw_vers | grep 'ProductVersion:' | grep -o '[0-9]*\.[0-9]*\.[0-9]*'`
    343343    DIST_ARCH="universal"
    344     if [ "$OS_VER" -lt "10.5.0" ]
    345     then
    346         DIST_BITS="32"
    347     else
    348         DIST_BITS="64"
    349     fi
     344    DIST_BITS="64"
    350345    APP_PLIST_BASE=${PLIST_DOMAIN}.${APP_NAME}
    351346    APP_PLIST=${APP_PLIST_BASE}.plist
Note: See TracChangeset for help on using the changeset viewer.