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.

Sign up for GitHub

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

Jump to bottom

Automatically enable EPEL after prompting users #3259

Merged
merged 3 commits into from Aug 18, 2016
Merged

Automatically enable EPEL after prompting users #3259

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44113a5
Automatically enable EPEL (after prompting users)
bmw Jul 8, 2016
5c16b43
satisfy OCD by removing space
bmw Aug 18, 2016
156c641
error out when we can't simply install epel-release
bmw Aug 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions letsencrypt-auto-source/letsencrypt-auto
View file
Open in desktop
Expand Up @@ -287,6 +287,10 @@ BootstrapRpmCommon() {

if ! $SUDO $tool list *virtualenv >/dev/null 2>&1; then
echo "To use Certbot, packages from the EPEL repository need to be installed."
if ! $SUDO $tool list epel-release >/dev/null 2>&1; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As long as we're sure that this package will always be visible on RPM-based systems where certbot-auto works.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we're not, I guess we can do something like make this a warning?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I guess this is fine, because we're inside the if about virtualenv. So overall, LGTM.

echo "Please enable this repository and try running Certbot again."
exit 1
fi
if [ "$ASSUME_YES" = 1 ]; then
/bin/echo -n "Enabling the EPEL repository in 3 seconds..."
sleep 1s
Copy link
Member

@erikrose erikrose Jul 27, 2016 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the s an actual thing? I can't find it documented in the Fedora man page, and OS X, at least, just ignores the s. You can sleep 1q with equal results.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sleep on Fedora etc is GNU sleep, which supports the s (as well as m and h).

Expand Down
4 changes: 4 additions & 0 deletions letsencrypt-auto-source/pieces/bootstrappers/rpm_common.sh
View file
Open in desktop
Expand Up @@ -23,6 +23,10 @@ BootstrapRpmCommon() {

if ! $SUDO $tool list *virtualenv >/dev/null 2>&1; then
echo "To use Certbot, packages from the EPEL repository need to be installed."
if ! $SUDO $tool list epel-release >/dev/null 2>&1; then
echo "Please enable this repository and try running Certbot again."
exit 1
fi
if [ "$ASSUME_YES" = 1 ]; then
/bin/echo -n "Enabling the EPEL repository in 3 seconds..."
sleep 1s
Expand Down