Abs paths for all commands

diff --git a/manifests/force.pp b/manifests/force.pp
index e56246bfdfaf59d53608fa37b64864c3268eb4aa..564ed75ff4db02fabc6214b2a1c5434e6c100f61 100644 (file)
--- a/manifests/force.pp
+++ b/manifests/force.pp
@@ -5,12 +5,12 @@ define apt::force(
        $release = 'testing',
        $version = false
 ) {
-       
-       exec { "aptitude -y -t ${release} install ${name}":
+
+       exec { "/usr/bin/aptitude -y -t ${release} install ${name}":
                unless => $version ? {
-                       false => "dpkg -l | grep ${name}",
-                       default => "dpkg -l | grep ${name} | grep ${version}"
+                       false => "/usr/bin/dpkg -l | grep ${name}",
+                       default => "/usr/bin/dpkg -l | grep ${name} | grep ${version}"
                }
        }
-       
+
 }

diff --git a/manifests/init.pp b/manifests/init.pp
index f7b77465671a69e3bb8f6e71548fc0e4a4d2780f..7513983c785bd9c0579428a4031c7656cbede021 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -2,8 +2,8 @@
 
 class apt {
        $root = '/etc/apt'
-       $provider = 'apt-get'
-       
+       $provider = '/usr/bin/apt-get'
+
        file { "sources.list":
                name => "${root}/sources.list",
                ensure => present,
@@ -11,14 +11,14 @@ class apt {
                group => root,
                mode => 644,
        }
-       
+
        file { "sources.list.d":
                name => "${root}/sources.list.d",
                ensure => directory,
                owner => root,
                group => root,
        }
-       
+
        exec { "apt_update":
                command => "${provider} update",
                subscribe => [ File["sources.list"], File["sources.list.d"] ],

diff --git a/manifests/pin.pp b/manifests/pin.pp
index 5a9dae6fafafb315e3134378334612d012727d0d..e8b251f7c882c60a413ecafa60509fb1d1230b99 100644 (file)
--- a/manifests/pin.pp
+++ b/manifests/pin.pp
@@ -7,7 +7,7 @@ define apt::pin(
 ) {
 
        include apt
-       
+
        file { "${name}.pref":
                name => "${apt::root}/preferences.d/${name}",
                ensure => file,

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 75f0a69574368316f4540567d00b92383645391b..51959cfbf27765a8a21619d25d16d0e7f3490fa4 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,10 +1,10 @@
 # ppa.pp
 
 define apt::ppa(
-       
+
 ) {
        include apt
-       
+
        exec { "/usr/bin/add-apt-repository ${name}":
                require => Package["python-software-properties"],
                # TODO: unless => 'check'

diff --git a/manifests/release.pp b/manifests/release.pp
index 294bb78f132013cd40bac5c4dc39b88ae9b34d17..cdd3da025dc5fdbff472a7371e58e24c82c63c60 100644 (file)
--- a/manifests/release.pp
+++ b/manifests/release.pp
@@ -4,11 +4,11 @@ define apt::release (
 
 ) {
        include apt
-       
+
        file { "${apt::root}/apt.conf.d/01release":
                owner => root,
                group => root,
                mode => 644,
                content => "APT::Default-Release \"${name}\";"
-       }       
+       }
 }

diff --git a/manifests/source.pp b/manifests/source.pp
index e9fa3083039c0aa76c9c4b580a370bc34bc15a63..d6d93e488691be5ce66cf176071d306a9ddeaad8 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -22,27 +22,27 @@ define apt::source(
                mode => 644,
                content => template("apt/source.list.erb"),
        }
-       
+
        if $pin != false {
                apt::pin { "${release}": priority => "${pin}" }
        }
-       
+
        exec { "${name} apt update":
                command => "${apt::provider} update",
                subscribe => File["${name}.list"],
                refreshonly => true,
        }
-       
+
        if $required_packages != false {
                exec { "${apt::provider} -y install ${required_packages}":
                        subscribe => File["${name}.list"],
                        refreshonly => true,
                }
        }
-       
+
        if $key != false {
-               exec { "apt-key adv --keyserver ${key_server} --recv-keys ${key}":
-                       unless => "apt-key list | grep ${key}",
+               exec { "/usr/bin/apt-key adv --keyserver ${key_server} --recv-keys ${key}":
+                       unless => "/usr/bin/apt-key list | grep ${key}",
                        before => File["${name}.list"],
                }
        }