From 884a7fd143506ec1a764acc03724a9e50d89d362 Mon Sep 17 00:00:00 2001 From: Bruno Tavares Date: Thu, 20 Mar 2014 18:21:45 -0300 Subject: [PATCH] Add pacman and Arch reporting --- kickstart/recipes/kickstart/os.sh | 1 + kickstart/recipes/kickstart/package.sh | 3 ++- kickstart/recipes/kickstart/package/install.sh | 4 ++++ kickstart/recipes/kickstart/package/installed.sh | 4 ++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/kickstart/recipes/kickstart/os.sh b/kickstart/recipes/kickstart/os.sh index 4591177..8cf5866 100644 --- a/kickstart/recipes/kickstart/os.sh +++ b/kickstart/recipes/kickstart/os.sh @@ -1,6 +1,7 @@ kickstart.os() { [ -f /etc/lsb-release ] && echo "Ubuntu" [ -f /etc/redhat-release ] && echo "RHEL" + [ -f /etc/arch-release ] && echo "Arch" uname -a | kickstart.stream.contains Darwin && echo "Mac" } diff --git a/kickstart/recipes/kickstart/package.sh b/kickstart/recipes/kickstart/package.sh index a3db67a..2f70910 100644 --- a/kickstart/recipes/kickstart/package.sh +++ b/kickstart/recipes/kickstart/package.sh @@ -2,7 +2,8 @@ kickstart.package.manager() { kickstart.command_exists apt-get && echo "apt-get" && return 0 kickstart.command_exists brew && echo "brew" && return 0 kickstart.command_exists yum && echo "yum" && return 0 - kickstart.info "kickstart supports apt-get, yum or brew" && exit 1 + kickstart.command_exists pacman && echo "pacman" && return 0 + kickstart.info "kickstart supports apt-get, yum, pacman or brew" && exit 1 } for recipe in recipes/kickstart/package/*.sh; do diff --git a/kickstart/recipes/kickstart/package/install.sh b/kickstart/recipes/kickstart/package/install.sh index 34f9d9f..6a08926 100644 --- a/kickstart/recipes/kickstart/package/install.sh +++ b/kickstart/recipes/kickstart/package/install.sh @@ -18,3 +18,7 @@ kickstart.package.install.brew() { kickstart.package.install.yum() { kickstart.mute yum install -y "$@" } + +kickstart.package.install.pacman() { + kickstart.mute pacman -S --noconfirm "$@" +} diff --git a/kickstart/recipes/kickstart/package/installed.sh b/kickstart/recipes/kickstart/package/installed.sh index 13e8111..e07dc44 100644 --- a/kickstart/recipes/kickstart/package/installed.sh +++ b/kickstart/recipes/kickstart/package/installed.sh @@ -10,6 +10,10 @@ kickstart.package.installed.brew() { ! $(brew info "$@" | kickstart.stream.contains "Not installed") } +kickstart.package.installed.pacman() { + kickstart.mute pacman -Q "$@" +} + kickstart.package.installed.yum() { local yum_packages="`yum list installed`" for package in "$@"; do