Dependencies update

diff --git a/Makefile b/Makefile
index 1ccf197d9307ed7ede3a75d4b8a1066efbaa72b6..f3ed3369845b2c704bc506bac635e524a7c8c5fe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ CWD    = $(shell pwd)
 REPO   = git://git.sarava.org/puppet-bootstrap.git
 PUPPET = FACTER_BOOTSTRAP_PATH="$(CWD)" puppet apply --confdir="$(CWD)" --modulepath=modules
 
-all: clean remote modules config
+all: deps clean remote modules config
 
 deps:
        bin/dependencies

diff --git a/bin/dependencies b/bin/dependencies
index c4108522bf113bac3cf7b617d03d3c7752ec30d3..7fda4fb4ce07992c4a1f45bc1cd4c4702cde226f 100755 (executable)
--- a/bin/dependencies
+++ b/bin/dependencies
@@ -13,10 +13,16 @@ function provision_package {
 
   if [ "$?" == "1" ]; then
     echo "Installing package $1..."
-    DEBIAN_FRONTEND=noninteractive apt-get install $1 -y
+    DEBIAN_FRONTEND=noninteractive $sudo apt-get install $1 -y
   fi
 }
 
+# Set sudo config
+local sudo device rsync
+if [ "`whoami`" != 'root' ]; then
+  sudo="sudo"
+fi
+
 # Ensure basic packages are installed.
 for package in puppet ruby-hiera-puppet mr whois; do
   provision_package $package