From afff86a57b15ea5bcde3de63a796aeab380d43da Mon Sep 17 00:00:00 2001 From: Jianhui Zhao Date: Tue, 5 Jun 2018 01:45:26 +0800 Subject: [PATCH] Optimize install.sh Signed-off-by: Jianhui Zhao --- tools/install.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/install.sh b/tools/install.sh index c2c7882..fe09323 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -50,11 +50,9 @@ cd libubox && cmake -DBUILD_LUA=OFF . && make install && cd - cd ustream-ssl git checkout 189cd38b4188bfcb4c8cf67d8ae71741ffc2b906 -SSL_VER_MAJOR=$(openssl version | cut -d' ' -f2 | cut -d. -f1) -SSL_VER_MINOR=$(openssl version | cut -d' ' -f2 | cut -d. -f2) -SSL_VER="${SSL_VER_MAJOR}${SSL_VER_MINOR}" +LIBSSL_VER=$(cat /usr/include/openssl/opensslv.h | grep OPENSSL_VERSION_NUMBER | sed 's/0x//' | grep -o '[0-9]\+') -[ $SSL_VER -ge 11 ] && { +[ $LIBSSL_VER -ge 1010000 ] && { quilt import ../rtty/tools/us-openssl_v1_1.patch quilt push -a }