From fc0899b2ad75cf42f85668fddd4646b651a9429a Mon Sep 17 00:00:00 2001 From: bcambl Date: Sun, 13 Oct 2019 14:35:38 -0600 Subject: [PATCH 1/2] fix fedora dependency check/install stdout Signed-off-by: bcambl --- automated install/basic-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index cc78afbf..11b78fcd 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -1645,9 +1645,9 @@ install_dependent_packages() { for i in "$@"; do printf " %b Checking for %s..." "${INFO}" "${i}" if "${PKG_MANAGER}" -q list installed "${i}" &> /dev/null; then - printf "%b %b Checking for %s" "${OVER}" "${TICK}" "${i}" + printf "%b %b Checking for %s\\n" "${OVER}" "${TICK}" "${i}" else - printf "%b %b Checking for %s (will be installed)" "${OVER}" "${INFO}" "${i}" + echo -e "${OVER} ${INFO} Checking for $i (will be installed)" installArray+=("${i}") fi done From 612d408034cc5e80d6678ebd48e24767140d402d Mon Sep 17 00:00:00 2001 From: bcambl Date: Mon, 14 Oct 2019 20:16:40 -0600 Subject: [PATCH 2/2] replace echo with printf in install_dependent_packages() Signed-off-by: bcambl --- automated install/basic-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 11b78fcd..c887a6c6 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -1628,7 +1628,7 @@ install_dependent_packages() { if dpkg-query -W -f='${Status}' "${i}" 2>/dev/null | grep "ok installed" &> /dev/null; then printf "%b %b Checking for %s\\n" "${OVER}" "${TICK}" "${i}" else - echo -e "${OVER} ${INFO} Checking for $i (will be installed)" + printf "%b %b Checking for %s (will be installed)\\n" "${OVER}" "${INFO}" "${i}" installArray+=("${i}") fi done @@ -1647,7 +1647,7 @@ install_dependent_packages() { if "${PKG_MANAGER}" -q list installed "${i}" &> /dev/null; then printf "%b %b Checking for %s\\n" "${OVER}" "${TICK}" "${i}" else - echo -e "${OVER} ${INFO} Checking for $i (will be installed)" + printf "%b %b Checking for %s (will be installed)\\n" "${OVER}" "${INFO}" "${i}" installArray+=("${i}") fi done