From fad2a8d76f5e2cdcac24073246f5ac94d251a141 Mon Sep 17 00:00:00 2001 From: Nathan Pierce Date: Mon, 1 Jul 2019 09:07:33 -0400 Subject: [PATCH 1/2] ok --- scripts/helpers/general.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/helpers/general.sh b/scripts/helpers/general.sh index 4fc4761fda1..9297d3d9f58 100755 --- a/scripts/helpers/general.sh +++ b/scripts/helpers/general.sh @@ -220,10 +220,10 @@ function ensure-yum-packages() { # || [[ -n "$testee" ]]; needed to see last line of deps file (https://stackoverflow.com/questions/12916352/shell-script-read-missing-last-line) while read -r testee tester || [[ -n "$testee" ]]; do if [[ ! -z $(eval $tester $testee) ]]; then - echo " - ${testee} ${COLOR_GREEN}found!${COLOR_NC}" + echo " - ${testee} ${COLOR_GREEN}ok${COLOR_NC}" else DEPS=$DEPS"${testee} " - echo " - ${testee} ${COLOR_RED}NOT${COLOR_NC} found." + echo " - ${testee} ${COLOR_RED}NOT${COLOR_NC} found!" (( COUNT+=1 )) fi done < $DEPS_FILE @@ -269,18 +269,18 @@ function ensure-brew-packages() { # || [[ -n "$nmae" ]]; needed to see last line of deps file (https://stackoverflow.com/questions/12916352/shell-script-read-missing-last-line) while read -r name path || [[ -n "$name" ]]; do if [[ -f $path ]] || [[ -d $path ]]; then - echo " - ${name} ${COLOR_GREEN}found!${COLOR_NC}" + echo " - ${name} ${COLOR_GREEN}ok${COLOR_NC}" continue fi # resolve conflict with homebrew glibtool and apple/gnu installs of libtool if [[ "${testee}" == "/usr/local/bin/glibtool" ]]; then if [ "${tester}" "/usr/local/bin/libtool" ]; then - echo " - ${name} ${COLOR_GREEN}found!${COLOR_NC}" + echo " - ${name} ${COLOR_GREEN}ok!${COLOR_NC}" continue fi fi DEPS=$DEPS"${name} " - echo " - ${name} ${COLOR_RED}NOT${COLOR_NC} found." + echo " - ${name} ${COLOR_RED}NOT${COLOR_NC} found!" (( COUNT+=1 )) done < $DEPS_FILE if [[ $COUNT > 0 ]]; then @@ -348,10 +348,10 @@ function ensure-apt-packages() { # || [[ -n "$testee" ]]; needed to see last line of deps file (https://stackoverflow.com/questions/12916352/shell-script-read-missing-last-line) while read -r testee tester || [[ -n "$testee" ]]; do if [[ ! -z $(eval $tester $testee 2>/dev/null) ]]; then - echo " - ${testee} ${COLOR_GREEN}found!${COLOR_NC}" + echo " - ${testee} ${COLOR_GREEN}ok${COLOR_NC}" else DEPS=$DEPS"${testee} " - echo " - ${testee} ${COLOR_RED}NOT${COLOR_NC} found." + echo " - ${testee} ${COLOR_RED}NOT${COLOR_NC} found!" (( COUNT+=1 )) fi done < $DEPS_FILE From cb51b34e3743c63eaa34fdbe72a0afe3ae66416b Mon Sep 17 00:00:00 2001 From: Nathan Pierce Date: Mon, 1 Jul 2019 11:34:26 -0400 Subject: [PATCH 2/2] quick fix --- scripts/helpers/general.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/helpers/general.sh b/scripts/helpers/general.sh index 9297d3d9f58..930f3e91d4a 100755 --- a/scripts/helpers/general.sh +++ b/scripts/helpers/general.sh @@ -275,7 +275,7 @@ function ensure-brew-packages() { # resolve conflict with homebrew glibtool and apple/gnu installs of libtool if [[ "${testee}" == "/usr/local/bin/glibtool" ]]; then if [ "${tester}" "/usr/local/bin/libtool" ]; then - echo " - ${name} ${COLOR_GREEN}ok!${COLOR_NC}" + echo " - ${name} ${COLOR_GREEN}ok${COLOR_NC}" continue fi fi