Skip to content

Commit

Permalink
Make clearer the messages for detection of multiple Apache installations
Browse files Browse the repository at this point in the history
  • Loading branch information
FooBarWidget committed Apr 24, 2015
1 parent 66f3c6f commit c71c63b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions bin/passenger-install-apache2-module
Expand Up @@ -190,7 +190,7 @@ private

def check_whether_there_are_multiple_apache_installs
new_screen
puts '<banner>Sanity checking Apache installation...</banner>'
puts '<banner>Checking whether there are multiple Apache installations...</banner>'

output = StringIO.new
detector = PlatformInfo::ApacheDetector.new(output)
Expand Down Expand Up @@ -238,7 +238,7 @@ private
return true
end
else
puts '<green>All good!</green>'
puts '<green>Only a single installation detected. This is good.</green>'
return true
end
ensure
Expand Down
4 changes: 2 additions & 2 deletions lib/phusion_passenger/config/validate_install_command.rb
Expand Up @@ -271,7 +271,7 @@ def check_no_other_installs_in_path
end

def check_whether_there_are_multiple_apache_installs
log '<banner>Sanity checking Apache installation...</banner>'
log '<banner>Checking whether there are multiple Apache installations...</banner>'

output = StringIO.new
detector = PlatformInfo::ApacheDetector.new(output)
Expand Down Expand Up @@ -348,7 +348,7 @@ def check_whether_there_are_multiple_apache_installs
exit(INTERNAL_ERROR_CODE)
end
else
log '<green>All good!</green>'
log '<green>Only a single installation detected. This is good.</green>'
end

display_separator
Expand Down

0 comments on commit c71c63b

Please sign in to comment.