From 675022f10e399d9662dd88a03a8fdf13a45b687b Mon Sep 17 00:00:00 2001 From: Jianhui Zhao Date: Sat, 20 Oct 2018 16:51:31 +0800 Subject: [PATCH] Optimize install.sh Signed-off-by: Jianhui Zhao --- tools/install.sh | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/tools/install.sh b/tools/install.sh index 03661ef..c42245c 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -75,26 +75,6 @@ check_tool() { check_cmd $tool || $INSTALL $tool } -check_lib_header() { - local header=$1 - local prefix=$2 - local path search - - search="/usr/include/$prefix" - path=$(find $search -type f -name $header 2>/dev/null) - [ -n "$path" ] && { - echo ${path%/*} | cut -d' ' -f1 - return - } - - search="/usr/local/include/$prefix" - path=$(find $search -type f -name $header 2>/dev/null) - [ -n "$path" ] && { - echo ${path%/*} | cut -d' ' -f1 - return - } -} - show_distribution detect_pkg_tool || { @@ -111,10 +91,9 @@ check_tool gcc check_tool make check_tool cmake check_tool git -check_tool quilt -check_lib_header ev.h > /dev/null || $INSTALL $PKG_LIBEV -check_lib_header ssl.h openssl > /dev/null || $INSTALL $PKG_SSL +$INSTALL $PKG_LIBEV +$INSTALL $PKG_SSL rm -rf /tmp/rtty-build mkdir /tmp/rtty-build @@ -133,6 +112,7 @@ git clone https://github.com/zhaojh329/rtty.git || { } # libuwsc +rm -f /usr/local/lib/libuwsc.* cd libuwsc && cmake . && make install && cd - [ $? -eq 0 ] || exit 1