From 42760d3d5150e8a4d98c7b08efe6b473c8a4cc89 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 23 Feb 2013 02:13:26 +0000 Subject: [PATCH] Arch is now detected as Arch Linux. --- bootstrap-salt.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 701b9f9..3aa58c3 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1295,13 +1295,13 @@ install_amazon_linux_ami_git_post() { # # Arch Install Functions # -install_arch_stable_deps() { +install_arch_linux_stable_deps() { grep '\[salt\]' /etc/pacman.conf >/dev/null 2>&1 || echo '[salt] Server = http://intothesaltmine.org/archlinux ' >> /etc/pacman.conf } -install_arch_git_deps() { +install_arch_linux_git_deps() { grep '\[salt\]' /etc/pacman.conf >/dev/null 2>&1 || echo '[salt] Server = http://intothesaltmine.org/archlinux ' >> /etc/pacman.conf @@ -1319,16 +1319,16 @@ Server = http://intothesaltmine.org/archlinux fi } -install_arch_stable() { +install_arch_linux_stable() { pacman -Sy --noconfirm pacman pacman -Syu --noconfirm salt } -install_arch_git() { +install_arch_linux_git() { python2 setup.py install } -install_arch_post() { +install_arch_linux_post() { for fname in minion master syndic; do # Skip if not meant to be installed @@ -1351,7 +1351,7 @@ install_arch_post() { done } -install_arch_git_post() { +install_arch_linux_git_post() { for fname in minion master syndic; do # Skip if not meant to be installed @@ -1377,7 +1377,7 @@ install_arch_git_post() { done } -install_arch_restart_daemons() { +install_arch_linux_restart_daemons() { for fname in minion master syndic; do # Skip if not meant to be installed