puppet: Second attempt at fixing puppet-check's rubygems dependency
This commit is contained in:
parent
8e8baaa349
commit
2f5656ca68
1 changed files with 8 additions and 8 deletions
|
@ -1,15 +1,16 @@
|
|||
#!/usr/bin/env ruby
|
||||
|
||||
if not defined? ::Bundler
|
||||
begin
|
||||
require 'rubygems'
|
||||
rescue LoadError
|
||||
end
|
||||
end
|
||||
|
||||
require "puppet"
|
||||
require "syslog"
|
||||
require "socket"
|
||||
|
||||
begin
|
||||
require "puppet"
|
||||
rescue LoadError
|
||||
require "rubygems"
|
||||
require "puppet"
|
||||
end
|
||||
|
||||
Syslog.open(File.basename(__FILE__), Syslog::LOG_PID | Syslog::LOG_NDELAY,
|
||||
Syslog::LOG_DAEMON)
|
||||
|
||||
|
@ -75,4 +76,3 @@ Syslog.warning err
|
|||
system("service --help > /dev/null 2>&1 && service puppet start > /dev/null")
|
||||
system(puppetd) if $?.exitstatus == 127
|
||||
Syslog.close
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue