Shell provisioner sudo fix

diff --git a/TODO.md b/TODO.md
index 5c8723cebbf16bf1b75f51b4745343abc95dfee4..62e44b399dc00f7173c4db87bac04e23b132a8cb 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -1,8 +1,6 @@
 TODO
 ====
 
-* Minimal manifest for fast provisioning.
-* Update to new nodo style (hiera and nodo::role).
 * Support for recursive clones in `bin/mrconfig`.
 * Test!
 * Puppet 3.x support:

diff --git a/bin/provision b/bin/provision
index a3e80d7a767fe73ea2c11bde0b799d4564f40ba2..6e06320c1354dbebfe8b9d8e16a08b9a262b727c 100755 (executable)
--- a/bin/provision
+++ b/bin/provision
@@ -3,8 +3,13 @@
 # Simple shell provisioner for Vagrant instances.
 #
 
+# Set sudo config
+if [ "`whoami`" != 'root' ]; then
+  sudo="sudo"
+fi
+
 # Ensure the system is updated.
-sudo apt-get update && DEBIAN_FRONTEND=noninteractive sudo apt-get dist-upgrade -y && sudo apt-get autoremove -y && sudo apt-get clean
+$sudo apt-get update && DEBIAN_FRONTEND=noninteractive $sudo apt-get dist-upgrade -y && $sudo apt-get autoremove -y && $sudo apt-get clean
 
 # Install dependencies
 source /vagrant/puppet/bin/dependencies
@@ -16,12 +21,12 @@ done
 
 # Link hiera configuration.
 if [ ! -h "/etc/puppet/hiera.yaml" ]; then
-  sudo rm -f /etc/puppet/hiera.yaml
-  sudo ln -s /vagrant/puppet/hiera/hiera.yaml /etc/puppet/hiera.yaml
+  $sudo rm -f /etc/puppet/hiera.yaml
+  $sudo ln -s /vagrant/puppet/hiera/hiera.yaml /etc/puppet/hiera.yaml
 fi
 
 # Link puppet configuration.
 if [ ! -h "/etc/puppet/puppet.conf" ]; then
-  sudo rm -f /etc/puppet/puppet.conf
-  sudo ln -s /vagrant/puppet/puppet.conf /etc/puppet/puppet.conf
+  $sudo rm -f /etc/puppet/puppet.conf
+  $sudo ln -s /vagrant/puppet/puppet.conf /etc/puppet/puppet.conf
 fi