Ignore:
Timestamp:
Jun 10, 2011 2:53:59 PM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
4e99c45
Parents:
cbaa62d (diff), 162c5bc (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 '14e8f430d97e8e6a9926d59299775ca98d590c8d'

and '2b3daf42c48bc7b83cfa015b1dba87538ee2f8db'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • installer/resources/postinstall.sh

    rcbaa62d r2c0e6a3  
    1717fi
    1818
    19 chmod 744 ./i2prouter
    20 # chmod 744 ./install_i2p_service_unix
    21 chmod 744 ./osid
    22 chmod 744 ./runplain.sh
    23 # chmod 744 ./uninstall_i2p_service_unix
     19chmod 755 ./i2prouter
     20# chmod 755 ./install_i2p_service_unix
     21chmod 755 ./osid
     22chmod 755 ./runplain.sh
     23# chmod 755 ./uninstall_i2p_service_unix
    2424
    2525ERROR_MSG="Cannot determine operating system type. From the subdirectory in lib/wrapper matching your operating system, please move i2psvc to your base I2P directory, and move the remaining two files to the lib directory."
     
    3333
    3434OS_ARCH=`uname -m`
    35 X86_64=`echo "$OS_ARCH" | grep x86_64`
     35X86_64=`echo "${OS_ARCH}" | grep x86_64`
    3636
    3737case $HOST_OS in
     
    3939        if [ "X$X86_64" = "X" ]; then
    4040            wrapperpath="./lib/wrapper/linux"
    41             cp $wrapperpath/libwrapper.so ./lib/
     41            cp ${wrapperpath}/libwrapper.so ./lib/
    4242        else
    4343            wrapperpath="./lib/wrapper/linux64"
    44             cp $wrapperpath/libwrapper.so ./lib
     44            cp ${wrapperpath}/libwrapper.so ./lib
    4545        fi
    4646        ;;
    4747    freebsd )
    48         wrapperpath="./lib/wrapper/freebsd"
    49         cp $wrapperpath/libwrapper.so ./lib/
     48        if [ ! `uname -m |grep amd64` ]; then
     49            wrapperpath="./lib/wrapper/freebsd"
     50            cp ${wrapperpath}/libwrapper.so ./lib/
     51        else
     52            wrapperpath="./lib/wrapper/freebsd64"
     53            cp ${wrapperpath}/libwrapper.so ./lib/
     54        fi
    5055        ;;
    5156    osx )
    5257        wrapperpath="./lib/wrapper/macosx"
    53         cp $wrapperpath/libwrapper.jnilib ./lib/
     58        cp ${wrapperpath}/libwrapper.jnilib ./lib/
    5459        ;;
    5560    solaris )
    5661        wrapperpath="./lib/wrapper/solaris"
    57         cp $wrapperpath/libwrapper.so ./lib/
     62        cp ${wrapperpath}/libwrapper.so ./lib/
    5863        ;;
    5964    * )
    60         echo "$ERROR_MSG"
     65        echo "${ERROR_MSG}"
    6166        exit 1
    6267        ;;
    6368esac
    6469
    65 cp $wrapperpath/wrapper.jar ./lib/
     70#cp $wrapperpath/wrapper.jar ./lib/
    6671cp $wrapperpath/i2psvc .
    67 chmod 744 ./eepget
    68 chmod 744 ./i2psvc
     72chmod 755 ./eepget
     73chmod 755 ./i2psvc
    6974rm -rf ./icons
    7075rm -rf ./lib/wrapper
Note: See TracChangeset for help on using the changeset viewer.