Changeset 43fdff22


Ignore:
Timestamp:
Jul 2, 2014 1:51:17 PM (6 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
ce2bb85
Parents:
06525ad
Message:

postinstall: remove some redundancy, update comments

Location:
installer/resources
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • installer/resources/osid

    r06525ad r43fdff22  
    55# osid
    66# 2004 The I2P Project
    7 # http://www.i2p2.de/
     7# https://geti2p.net
    88# This code is public domain.
    99#
  • installer/resources/postinstall.sh

    r06525ad r43fdff22  
    55# postinstall
    66# 2004 The I2P Project
    7 # http://www.i2p2.de/
     7# https://geti2p.net
    88# This code is public domain.
    99#
     
    1111#
    1212# Installs the appropriate set of Java Service Wrapper support files for the
    13 # user's OS then launches the I2P router as a background service.
     13# user's OS
    1414
    1515if [ ! "X$1" = "X" ]; then
     
    1818
    1919chmod 755 ./i2prouter
    20 # chmod 755 ./install_i2p_service_unix
    2120chmod 755 ./osid
    2221chmod 755 ./runplain.sh
    23 # chmod 755 ./uninstall_i2p_service_unix
    2422
    2523ERROR_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."
     
    4543        if [ `echo $OS_ARCH |grep armv7` ]; then
    4644            wrapperpath="./lib/wrapper/linux-armv5"
    47             cp ${wrapperpath}/libwrapper.so ./lib/
    4845        elif [ `echo $OS_ARCH |grep armv6` ]; then
    4946            wrapperpath="./lib/wrapper/linux-armv6"
    50             cp ${wrapperpath}/libwrapper.so ./lib/
    5147        elif [ `echo $OS_ARCH |grep arm` ]; then
    5248            wrapperpath="./lib/wrapper/linux-armv5"
    53             cp ${wrapperpath}/libwrapper.so ./lib/
    5449        elif [ `echo $OS_ARCH |grep ppc` ]; then
    5550            wrapperpath="./lib/wrapper/linux-ppc"
    56             cp ${wrapperpath}/libwrapper.so ./lib/
    5751        elif [ "X$X86_64" = "X" ]; then
    5852            wrapperpath="./lib/wrapper/linux"
    59             cp ${wrapperpath}/libwrapper.so ./lib/
    6053        else
    6154            wrapperpath="./lib/wrapper/linux64"
    62             cp ${wrapperpath}/libwrapper.so ./lib
    6355            # the 32bit libwrapper.so will be needed if a 32 bit jvm is used
    6456            cp ./lib/wrapper/linux/libwrapper.so ./lib/libwrapper-linux-x86-32.so
    6557        fi
     58        cp ${wrapperpath}/libwrapper.so ./lib/
    6659        ;;
    6760    freebsd )
    6861        if [ ! `echo $OS_ARCH | grep amd64` ]; then
    6962            wrapperpath="./lib/wrapper/freebsd"
    70             cp ${wrapperpath}/libwrapper.so ./lib/
    7163        else
    7264            wrapperpath="./lib/wrapper/freebsd64"
    73             cp ${wrapperpath}/libwrapper.so ./lib/
    7465            # the 32bit libwrapper.so will be needed if a 32 bit jvm is used
    7566            cp ./lib/wrapper/freebsd/libwrapper.so ./lib/libwrapper-freebsd-x86-32.so
    7667        fi
     68        cp ${wrapperpath}/libwrapper.so ./lib/
    7769        ;;
    7870    osx )
     
    9183        # This isn't displayed when installing, but if we fall back to the "*)"
    9284        # choice, no cleanup happens and users are advised to copy the wrapper
    93         # in place...but there is no wrapper. Figuring how how to display this,
     85        # in place...but there is no wrapper. Figuring out how to display this,
    9486        # such as when doing a headless installation would be good.
    9587        echo "The java wrapper is not supported on this platform."
     
    112104
    113105chmod 755 ./eepget
    114 rm -rf ./icons
    115 rm -rf ./lib/wrapper
    116 rm -f ./lib/*.dll
    117 rm -f ./*.bat
    118 rm -f ./*.cmd
    119 rm -f ./*.exe
    120 rm -rf ./utility.jar
     106rm -rf ./icons ./lib/wrapper
     107rm -f ./lib/*.dll /*.bat ./*.cmd ./*.exe ./utility.jar
    121108
    122109if [ ! `echo $HOST_OS  |grep osx` ]; then
Note: See TracChangeset for help on using the changeset viewer.