Changeset d71b71f


Ignore:
Timestamp:
Sep 19, 2011 12:21:38 PM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
6760d2a
Parents:
04785e2
Message:

Don't prompt to move the wrapper on NetBSD or OpenBSD.

Location:
installer/resources
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • installer/resources/osid

    r04785e2 rd71b71f  
    2222#     solaris  = Solaris
    2323#     suse     = SuSE
     24#     openbsd  = OpenBSD
     25#     netbsd   = NetBSD
    2426#     unknown  = OS could not be determined
    2527
     
    3739SOLARIS=`echo "$HOST_OS" | grep Solaris`
    3840SUNOS=`echo "$HOST_OS" | grep SunOS`
     41NETBSD=`echo "$HOST_OS" |grep NetBSD`
     42OPENBSD=`echo "$HOST_OS" |grep OpenBSD`
    3943
    4044if [ ! "X$DARWIN" = "X" -o ! "X$MAC" = "X" ]; then
     
    4549if [ ! "X$FREEBSD" = "X" ]; then
    4650    echo freebsd
     51    exit 0
     52fi
     53
     54if [ ! "X$NETBSD" = "X" ]; then
     55    echo netbsd
     56    exit 0
     57fi
     58
     59if [ ! "X$OPENBSD" = "X" ]; then
     60    echo openbsd
    4761    exit 0
    4862fi
  • installer/resources/postinstall.sh

    r04785e2 rd71b71f  
    4747            wrapperpath="./lib/wrapper/linux-armv5"
    4848            cp ${wrapperpath}/libwrapper.so ./lib/
    49         elif [ `echo $OS_ARCH |grep ppc` ]; then
    50             wrapperpath="./lib/wrapper/linux-ppc"
    51             cp ${wrapperpath}/libwrapper.so ./lib/
     49        elif [ `echo $OS_ARCH |grep ppc` ]; then
     50            wrapperpath="./lib/wrapper/linux-ppc"
     51            cp ${wrapperpath}/libwrapper.so ./lib/
    5252        elif [ "X$X86_64" = "X" ]; then
    5353            wrapperpath="./lib/wrapper/linux"
     
    5656            wrapperpath="./lib/wrapper/linux64"
    5757            cp ${wrapperpath}/libwrapper.so ./lib
    58             # the 32bit libwrapper.so will be needed if a 32 bit jvm is used
    59             cp ./lib/wrapper/linux/libwrapper.so ./lib/libwrapper-linux-x86-32.so
     58            # the 32bit libwrapper.so will be needed if a 32 bit jvm is used
     59            cp ./lib/wrapper/linux/libwrapper.so ./lib/libwrapper-linux-x86-32.so
    6060        fi
    6161        ;;
    6262    freebsd )
    63         if [ ! `echo $OS_ARCH | grep amd64` ]; then
    64             wrapperpath="./lib/wrapper/freebsd"
    65             cp ${wrapperpath}/libwrapper.so ./lib/
    66         else
    67             wrapperpath="./lib/wrapper/freebsd64"
    68             cp ${wrapperpath}/libwrapper.so ./lib/
    69             # the 32bit libwrapper.so will be needed if a 32 bit jvm is used
    70             cp ./lib/freebsd/libwrapper.so ./lib/libwrapper-freebsd-x86-32.so
    71         fi
     63        if [ ! `echo $OS_ARCH | grep amd64` ]; then
     64            wrapperpath="./lib/wrapper/freebsd"
     65            cp ${wrapperpath}/libwrapper.so ./lib/
     66        else
     67            wrapperpath="./lib/wrapper/freebsd64"
     68            cp ${wrapperpath}/libwrapper.so ./lib/
     69            # the 32bit libwrapper.so will be needed if a 32 bit jvm is used
     70            cp ./lib/freebsd/libwrapper.so ./lib/libwrapper-freebsd-x86-32.so
     71        fi
    7272        ;;
    7373    osx )
    7474        wrapperpath="./lib/wrapper/macosx"
    7575        cp ${wrapperpath}/libwrapper.jnilib ./lib/
    76         chmod 755 ./Start\ I2P\ Router.app/Contents/MacOS/i2prouter
     76        chmod 755 ./Start\ I2P\ Router.app/Contents/MacOS/i2prouter
    7777        ;;
    7878    solaris )
    7979        wrapperpath="./lib/wrapper/solaris"
    8080        cp ${wrapperpath}/libwrapper.so ./lib/
     81        ;;
     82    netbsd|openbsd )
     83        # FIXME
     84        # This isn't displayed when installing, but if we fall back to the "*)"
     85        # choice, no cleanup happens and users are advised to copy the wrapper
     86        # in place...but there is no wrapper. Figuring how how to display this,
     87        # such as when doing a headless installation would be good.
     88        echo "The java wrapper is not supported on this platform."
     89        echo "Please use `pwd`/runplain.sh to start I2P."
     90        # But at least the cleanup below will happen.
    8191        ;;
    8292    * )
     
    8999esac
    90100
    91 cp $wrapperpath/i2psvc .
     101if [ ! "X$wrapperpath" = "x" ]; then
     102    cp $wrapperpath/i2psvc .
     103    chmod 755 ./i2psvc
     104fi
     105
    92106chmod 755 ./eepget
    93 chmod 755 ./i2psvc
    94107rm -rf ./icons
    95108rm -rf ./lib/wrapper
     
    110123rm -f ./postinstall.sh
    111124exit 0
    112 
Note: See TracChangeset for help on using the changeset viewer.