Merge pull request #50 from stagrlee/master

Trying out puppet 4 on ubuntu

Author: grubernaut

ubuntu.sh

@@ -2,12 +2,19 @@
 #
 # This bootstraps Puppet on Ubuntu 12.04 LTS.
 #
+# To try puppet 4 -->  PUPPET_COLLECTION=pc1 ./ubuntu.sh
+#
 set -e
 
 # Load up the release information
 . /etc/lsb-release
 
-REPO_DEB_URL="http://apt.puppetlabs.com/puppetlabs-release-${DISTRIB_CODENAME}.deb"
+# if PUPPET_COLLECTION is not prepended with a dash "-", add it
+[[ "${PUPPET_COLLECTION}" == "" ]] || [[ "${PUPPET_COLLECTION:0:1}" == "-" ]] || \
+  PUPPET_COLLECTION="-${PUPPET_COLLECTION}"
+[[ "${PUPPET_COLLECTION}" == "" ]] && PINST="puppet" || PINST="puppet-agent"
+
+REPO_DEB_URL="http://apt.puppetlabs.com/puppetlabs-release${PUPPET_COLLECTION}-${DISTRIB_CODENAME}.deb"
 
 #--------------------------------------------------------------------
 # NO TUNABLES BELOW THIS POINT
@@ -39,7 +46,7 @@ apt-get update >/dev/null
 
 # Install Puppet
 echo "Installing Puppet..."
-DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install puppet >/dev/null
+DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install ${PINST} >/dev/null
 
 echo "Puppet installed!"