From 401ece980b9f3a9aa09845b684d92800385cd776 Mon Sep 17 00:00:00 2001 From: AlexPeshkoff Date: Mon, 29 Aug 2022 19:47:06 +0300 Subject: [PATCH] Fixed #7283: Suspicious error message during install --- builds/install/arch-specific/linux/makeInstallImage.sh.in | 4 ++-- builds/install/posix-common/posixLibrary.sh.in | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/builds/install/arch-specific/linux/makeInstallImage.sh.in b/builds/install/arch-specific/linux/makeInstallImage.sh.in index a29a467024..50ef9415ac 100644 --- a/builds/install/arch-specific/linux/makeInstallImage.sh.in +++ b/builds/install/arch-specific/linux/makeInstallImage.sh.in @@ -57,8 +57,8 @@ addLibs() { LIB=`objdump -p $libSdir/firebird|grep NEEDED|grep tomcrypt|awk '{print $2;}'` [ "$LIB" ] && echo "export LIBTOMCRYPT=$LIB" >>$libTarget - LIB=`objdump -p $libSdir/isql|grep NEEDED|egrep "(curses|termcap|tinfo)"|awk '{print $2;}'` - [ "$LIB" ] && echo "export LIBCURSES=$LIB" >>$libTarget + LIB=$(echo `objdump -p $libSdir/isql|grep NEEDED|egrep "(curses|termcap|tinfo)"|awk '{print $2;}'`) + [ "$LIB" ] && echo "export LIBCURSES='$LIB'" >>$libTarget echo >>$libTarget for i in posixLibrary.sh linuxLibrary.sh diff --git a/builds/install/posix-common/posixLibrary.sh.in b/builds/install/posix-common/posixLibrary.sh.in index 4f9edf85c3..1b67507498 100644 --- a/builds/install/posix-common/posixLibrary.sh.in +++ b/builds/install/posix-common/posixLibrary.sh.in @@ -211,8 +211,11 @@ missingLibrary() { # Check library presence, errorexit when missing checkLibrary() { - libName=${1} - haveLibrary $libName || missingLibrary $libName + libList=${1} + for libName in $libList + do + haveLibrary $libName || missingLibrary $libName + done }