Changeset e2b6835


Ignore:
Timestamp:
Aug 11, 2012 12:26:32 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
0ea6513
Parents:
14587eb (diff), f5b808b9 (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 '15095538e7b5c72468863e969541571ade1796f9'

and '39af5d31a13c5d5b71107e2caa0c234b84827c03'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • installer/resources/i2prouter

    r14587eb re2b6835  
    360360if [ "$DIST_OS" = "macosx" ]
    361361then
    362     OS_VER=`sw_vers | grep 'ProductVersion:' | grep -o '[0-9]*\.[0-9]*\.[0-9]*'`
     362    OS_VER=`sw_vers | grep ProductVersion | cut -d: -f2 | sed -e 's/[^0-9]*//'`
    363363    DIST_ARCH="universal"
    364364    if [ $(sysctl -n hw.cpu64bit_capable) -eq 1 ]; then
Note: See TracChangeset for help on using the changeset viewer.