Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Commit

Permalink
ok
Browse files Browse the repository at this point in the history
  • Loading branch information
Nathan Pierce committed Jul 1, 2019
1 parent cc809d2 commit 78aa058
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions scripts/helpers/general.sh
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ 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}exists${COLOR_NC}"
echo " - ${testee} ${COLOR_GREEN}ok${COLOR_NC}"
else
DEPS=$DEPS"${testee} "
echo " - ${testee} ${COLOR_RED}NOT${COLOR_NC} found!"
Expand Down Expand Up @@ -269,13 +269,13 @@ 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}exists${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}exists${COLOR_NC}"
echo " - ${name} ${COLOR_GREEN}ok${COLOR_NC}"
continue
fi
fi
Expand Down Expand Up @@ -348,7 +348,7 @@ 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}exists${COLOR_NC}"
echo " - ${testee} ${COLOR_GREEN}ok${COLOR_NC}"
else
DEPS=$DEPS"${testee} "
echo " - ${testee} ${COLOR_RED}NOT${COLOR_NC} found!"
Expand Down

0 comments on commit 78aa058

Please sign in to comment.