Merge pull request #352 from mhaskel/pe_next_fixes

bmjen · bmjen · commit d336ea0c58d7 · 2015-07-15T17:30:43.000-07:00
Use AIO ruby if available
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -209,10 +209,12 @@
       if $::kernel == 'windows' {
         $command_path = "${::env_windows_installdir}/bin:${::path}"
       } else {
-        $command_path = "/opt/puppet/bin:${::path}"
+        $command_path = "/opt/puppetlabs/puppet/bin:/opt/puppet/bin:${::path}"
       }
-    } else {
+    } elsif $::kernel == 'windows' {
       $command_path = $::path
+    } else {
+      $command_path = "/opt/puppetlabs/puppet/bin:${::path}"
     }
 
     # if puppet is running as root, this exec should also run as root to allow

Original file line number	Diff line number	Diff line change
`@@ -209,10 +209,12 @@`
`209`	`209`	`if $::kernel == 'windows' {`
`210`	`210`	`$command_path = "${::env_windows_installdir}/bin:${::path}"`
`211`	`211`	`} else {`
`212`		`- $command_path = "/opt/puppet/bin:${::path}"`
	`212`	`+ $command_path = "/opt/puppetlabs/puppet/bin:/opt/puppet/bin:${::path}"`
`213`	`213`	`}`
`214`		`- } else {`
	`214`	`+ } elsif $::kernel == 'windows' {`
`215`	`215`	`$command_path = $::path`
	`216`	`+ } else {`
	`217`	`+ $command_path = "/opt/puppetlabs/puppet/bin:${::path}"`
`216`	`218`	`}`
`217`	`219`
`218`	`220`	`# if puppet is running as root, this exec should also run as root to allow`