From f44888f192d78d8ce1e3583f70f94b0c2039c1e2 Mon Sep 17 00:00:00 2001 From: Dennis Camera Date: Sun, 8 Nov 2020 14:02:08 +0100 Subject: [PATCH] [type/__localedef] Only install dependencies in manifest. OS checking moved to gencode-remote --- cdist/conf/type/__localedef/manifest | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/cdist/conf/type/__localedef/manifest b/cdist/conf/type/__localedef/manifest index 9f1e17ac..3ab3ad8c 100755 --- a/cdist/conf/type/__localedef/manifest +++ b/cdist/conf/type/__localedef/manifest @@ -2,6 +2,7 @@ # # 2013-2019 Nico Schottelius (nico-cdist at schottelius.org) # 2015 David Hürlimann (david at ungleich.ch) +# 2020 Dennis Camera (dennis.camera at ssrq-sds-fds.ch) # # This file is part of cdist. # @@ -18,24 +19,12 @@ # You should have received a copy of the GNU General Public License # along with cdist. If not, see . # -# -# Install required packages +# Install required packages. # -os=$(cat "$__global/explorer/os") - - -case "$os" in - debian|devuan) - # Debian needs a seperate package - __package locales --state present - ;; - archlinux|suse|ubuntu|scientific|centos|alpine) - : - ;; - *) - echo "Sorry, do not know how to handle os: $os" >&2 - echo "Please edit the type ${__type##*/} to fix this." >&2 - exit 1 - ;; +case $(cat "${__global:?}/explorer/os") +in + (debian|devuan) + __package_apt locales --state present + ;; esac