Skip to content

Commit 1da75cc

Browse files
committed
Merge pull request #42 from stagrlee/master
Add exec mode, minor fixes
2 parents 2c45e8b + 2aef178 commit 1da75cc

File tree

7 files changed

+6
-6
lines changed

7 files changed

+6
-6
lines changed

arch.sh

100644100755
File mode changed.

centos_5_x.sh

100644100755
File mode changed.

centos_6_x.sh

100644100755
File mode changed.

centos_7_x.sh

100644100755
File mode changed.

debian.sh

100644100755
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ apt-get update >/dev/null
99

1010
# Older versions of Debian don't have lsb_release by default, so
1111
# install that if we have to.
12-
which lsb_release || apt-get install -y lsb-release
12+
which lsb_release || apt-get --yes install lsb-release
1313

1414
# Load up the release information
1515
DISTRIB_CODENAME=$(lsb_release -c -s)
@@ -19,14 +19,14 @@ REPO_DEB_URL="http://apt.puppetlabs.com/puppetlabs-release-${DISTRIB_CODENAME}.d
1919
#--------------------------------------------------------------------
2020
# NO TUNABLES BELOW THIS POINT
2121
#--------------------------------------------------------------------
22-
if [ "$EUID" -ne "0" ]; then
22+
if [ "$EUID" != "0" ]; then
2323
echo "This script must be run as root." >&2
2424
exit 1
2525
fi
2626

2727
# Install wget if we have to (some older Debian versions)
2828
echo "Installing wget..."
29-
apt-get install -y wget >/dev/null
29+
apt-get --yes install wget >/dev/null
3030

3131
# Install the PuppetLabs repo
3232
echo "Configuring PuppetLabs repo..."

solaris.sh

100644100755
File mode changed.

ubuntu.sh

100644100755
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ apt-get update >/dev/null
2828

2929
# Install wget if we have to (some older Ubuntu versions)
3030
echo "Installing wget..."
31-
apt-get install -y wget >/dev/null
31+
apt-get --yes install wget >/dev/null
3232

3333
# Install the PuppetLabs repo
3434
echo "Configuring PuppetLabs repo..."
@@ -45,8 +45,8 @@ echo "Puppet installed!"
4545

4646
# Install RubyGems for the provider
4747
echo "Installing RubyGems..."
48-
if [ $DISTRIB_CODENAME != "trusty" ]; then
49-
apt-get install -y rubygems >/dev/null
48+
if [ "$DISTRIB_CODENAME" != "trusty" ]; then
49+
apt-get --yes install rubygems >/dev/null
5050
fi
5151
gem install --no-ri --no-rdoc rubygems-update
5252
update_rubygems >/dev/null

0 commit comments

Comments
 (0)