Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check that user is root only if installation is required #475

Merged
merged 1 commit into from
Apr 1, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions tasks/install_shell.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,6 @@ else
mac_source='http://downloads.puppet.com'
fi

# Error if non-root
if [ `id -u` -ne 0 ]; then
echo "puppet_agent::install task must be run as root"
exit 1
fi

# Track to handle puppet5 to puppet6
if [ -f /opt/puppetlabs/puppet/VERSION ]; then
installed_version=`cat /opt/puppetlabs/puppet/VERSION`
Expand Down Expand Up @@ -122,6 +116,12 @@ else
fi
fi

# Error if non-root
if [ `id -u` -ne 0 ]; then
echo "puppet_agent::install task must be run as root"
exit 1
fi

# Retrieve Platform and Platform Version
# Utilize facts implementation when available
if [ -f "$PT__installdir/facts/tasks/bash.sh" ]; then
Expand Down