From 49b6f37e77542c425a8bb81ddf57ccd1a153d7e2 Mon Sep 17 00:00:00 2001 From: Damian Duesentrieb Date: Sun, 25 Oct 2015 22:27:11 +0100 Subject: [PATCH] Support for Manjaro Linux --- bootstrap/_arch_common.sh | 19 +++++++++++++++++++ bootstrap/archlinux.sh | 16 +--------------- bootstrap/manjaro.sh | 1 + letsencrypt-auto | 3 +++ 4 files changed, 24 insertions(+), 15 deletions(-) create mode 100755 bootstrap/_arch_common.sh mode change 100755 => 120000 bootstrap/archlinux.sh create mode 120000 bootstrap/manjaro.sh diff --git a/bootstrap/_arch_common.sh b/bootstrap/_arch_common.sh new file mode 100755 index 000000000..da78ead01 --- /dev/null +++ b/bootstrap/_arch_common.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +# Tested with: +# - Manjaro 15.09 (x86_64) +# - ArchLinux (x86_64) + +# "python-virtualenv" is Python3, but "python2-virtualenv" provides +# only "virtualenv2" binary, not "virtualenv" necessary in +# ./bootstrap/dev/_common_venv.sh +pacman -S --needed \ + git \ + python2 \ + python-virtualenv \ + gcc \ + dialog \ + augeas \ + openssl \ + libffi \ + ca-certificates \ diff --git a/bootstrap/archlinux.sh b/bootstrap/archlinux.sh deleted file mode 100755 index 884262f0b..000000000 --- a/bootstrap/archlinux.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# "python-virtualenv" is Python3, but "python2-virtualenv" provides -# only "virtualenv2" binary, not "virtualenv" necessary in -# ./bootstrap/dev/_common_venv.sh -pacman -S --needed \ - git \ - python2 \ - python-virtualenv \ - gcc \ - dialog \ - augeas \ - openssl \ - libffi \ - ca-certificates \ diff --git a/bootstrap/archlinux.sh b/bootstrap/archlinux.sh new file mode 120000 index 000000000..c5c9479f7 --- /dev/null +++ b/bootstrap/archlinux.sh @@ -0,0 +1 @@ +_arch_common.sh \ No newline at end of file diff --git a/bootstrap/manjaro.sh b/bootstrap/manjaro.sh new file mode 120000 index 000000000..c5c9479f7 --- /dev/null +++ b/bootstrap/manjaro.sh @@ -0,0 +1 @@ +_arch_common.sh \ No newline at end of file diff --git a/letsencrypt-auto b/letsencrypt-auto index 5b974c1f8..769f5a1d9 100755 --- a/letsencrypt-auto +++ b/letsencrypt-auto @@ -41,6 +41,9 @@ then elif [ -f /etc/arch-release ] ; then echo "Bootstrapping dependencies for Archlinux..." $SUDO $BOOTSTRAP/archlinux.sh + elif [ -f /etc/manjaro-release ] ; then + echo "Bootstrapping dependencies for Manjaro Linux..." + $SUDO $BOOTSTRAP/manjaro.sh elif [ -f /etc/redhat-release ] ; then echo "Bootstrapping dependencies for RedHat-based OSes..." $SUDO $BOOTSTRAP/_rpm_common.sh