From 47af90247485c22326c95621806087f25088520f Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Mon, 10 Jan 2011 20:46:10 -0500
Subject: fix the bc dependency (closes: #2690)

this is done by removing the hacky `if !defined` on the bc package by removing the package dependency altogether and replacing the places where it is used by shell built-in math functions.

this is a follow-up commit to 1455b1f9a55cdffc582fd93fa0bc5c016585760c
---
 files/cron.d/puppetd        | 4 ++--
 files/cron.d/puppetd.CentOS | 4 ++--
 files/cron.d/puppetd.Gentoo | 4 ++--
 manifests/linux.pp          | 7 -------
 manifests/openbsd.pp        | 4 ++--
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/files/cron.d/puppetd b/files/cron.d/puppetd
index 92af3e2..8b2c289 100644
--- a/files/cron.d/puppetd
+++ b/files/cron.d/puppetd
@@ -1,5 +1,5 @@
 # check if puppet is running
-0 * * * *   root    /bin/ps ax | /bin/grep -v grep | /bin/grep -q puppetd || (sleep `echo $RANDOM/2000*60 | bc` &&  /etc/init.d/puppet restart)
+0 * * * *   root    /bin/ps ax | /bin/grep -v grep | /bin/grep -q puppetd || (sleep $(($RANDOM/2000*60)) &&  /etc/init.d/puppet restart)
 # restart puppet once in a while and randomly delay the restart between 0 and 32 minutes -> splay puppetmaster hammering
-0 22 * * */2   root   sleep `echo $RANDOM/1000*60 | bc` &&  /etc/init.d/puppet restart > /dev/null
+0 22 * * */2   root   sleep $(($RANDOM/1000*60)) &&  /etc/init.d/puppet restart > /dev/null
 
diff --git a/files/cron.d/puppetd.CentOS b/files/cron.d/puppetd.CentOS
index 9787231..65239ce 100644
--- a/files/cron.d/puppetd.CentOS
+++ b/files/cron.d/puppetd.CentOS
@@ -1,5 +1,5 @@
 # check if puppet is running
-0 * * * *   root    /etc/init.d/puppet status > /dev/null || (sleep `echo $RANDOM/2000*60 | bc` && /etc/init.d/puppet restart)
+0 * * * *   root    /etc/init.d/puppet status > /dev/null || (sleep  $(($RANDOM/2000*60)) && /etc/init.d/puppet restart)
 # restart puppet once in a while and randomly delay the restart between 0 and 32 minutes -> splay puppetmaster hammering
-0 22 * * */2   root   sleep `echo $RANDOM/1000*60 | bc` &&  /etc/init.d/puppet restart > /dev/null
+0 22 * * */2   root   sleep $(($RANDOM/1000*60)) &&  /etc/init.d/puppet restart > /dev/null
 
diff --git a/files/cron.d/puppetd.Gentoo b/files/cron.d/puppetd.Gentoo
index 29655b9..c9811c2 100644
--- a/files/cron.d/puppetd.Gentoo
+++ b/files/cron.d/puppetd.Gentoo
@@ -1,5 +1,5 @@
 # check if puppet is running
-# 0 * * * *   root    /bin/ps ax | /bin/grep -v grep | /bin/grep -q puppetd || ( sleep `echo $RANDOM/2000*60 | bc` && /etc/init.d/puppet restart )
+# 0 * * * *   root    /bin/ps ax | /bin/grep -v grep | /bin/grep -q puppetd || ( sleep $(($RANDOM/2000*60)) && /etc/init.d/puppet restart )
 # restart puppet once in a while and randomly delay the restart between 0 and 32 minutes -> splay puppetmaster hammering
-# 0 22 * * */2   root   sleep `echo $RANDOM/1000*60 | bc` &&  /etc/init.d/puppet restart > /dev/null
+# 0 22 * * */2   root   sleep $(($RANDOM/1000*60)) &&  /etc/init.d/puppet restart > /dev/null
 
diff --git a/manifests/linux.pp b/manifests/linux.pp
index cf79e00..3a35d75 100644
--- a/manifests/linux.pp
+++ b/manifests/linux.pp
@@ -10,13 +10,6 @@ class puppet::linux inherits puppet::base {
     ensure => $facter_ensure_version,
   }
 
-  if !defined(Package["bc"]) {
-    if $bc_ensure_version == '' { $bc_ensure_version = 'installed' }
-    package { 'bc':
-      ensure => $bc_ensure_version,
-    }
-  }
-
   Service['puppet']{
     require => Package[puppet],
   }
diff --git a/manifests/openbsd.pp b/manifests/openbsd.pp
index cff727e..2e3c493 100644
--- a/manifests/openbsd.pp
+++ b/manifests/openbsd.pp
@@ -19,12 +19,12 @@ class puppet::openbsd inherits puppet::base {
   
   cron {
     'puppetd_check':
-      command => '/bin/ps ax | /usr/bin/grep -v grep | /usr/bin/grep -q "puppet agent" || (sleep `echo $RANDOM/2000*60 | bc` && /usr/local/bin/puppet agent)',
+      command => '/bin/ps ax | /usr/bin/grep -v grep | /usr/bin/grep -q "puppet agent" || (sleep $(($RANDOM/2000*60)) && /usr/local/bin/puppet agent)',
       user => root,
       minute => 0;
 
     'puppetd_restart':
-      command => 'sleep `echo $RANDOM/2000*60 | bc` && /bin/kill `/bin/cat /var/run/puppet/agent.pid`; /usr/local/bin/puppet agent',
+      command => 'sleep $((echo $RANDOM/2000*60)) && /bin/kill `/bin/cat /var/run/puppet/agent.pid`; /usr/local/bin/puppet agent',
       minute => 0,
       hour => 22,
       monthday => '*/2',
-- 
cgit v1.2.3