From 6bd456f1e8891b5299bc19c9c810d8314b37318b Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 4 Feb 2011 23:04:27 +0100 Subject: [PATCH] remove lib.obsoleted and save pacman hint Signed-off-by: Nico Schottelius --- conf/lib.obsoleted/cdist_file.sh | 30 --------------- conf/lib.obsoleted/cdist_package.sh | 37 ------------------- .../cdist_package_backend_pacman_install.sh | 28 -------------- .../cdist_package_select_backend.sh | 28 -------------- conf/types/package/hints | 2 + 5 files changed, 2 insertions(+), 123 deletions(-) delete mode 100644 conf/lib.obsoleted/cdist_file.sh delete mode 100644 conf/lib.obsoleted/cdist_package.sh delete mode 100644 conf/lib.obsoleted/cdist_package_backend_pacman_install.sh delete mode 100644 conf/lib.obsoleted/cdist_package_select_backend.sh create mode 100644 conf/types/package/hints diff --git a/conf/lib.obsoleted/cdist_file.sh b/conf/lib.obsoleted/cdist_file.sh deleted file mode 100644 index 63f883a5..00000000 --- a/conf/lib.obsoleted/cdist_file.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# 2010 Nico Schottelius (nico-cdist at schottelius.org) -# -# This file is part of cdist. -# -# cdist is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# cdist is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with cdist. If not, see . -# -# - -cdist_file() -{ - src="$1"; shift - dst="$1"; shift - - # FIXME later: ownership, permissions - cp "${src}" "${dst}" - -} diff --git a/conf/lib.obsoleted/cdist_package.sh b/conf/lib.obsoleted/cdist_package.sh deleted file mode 100644 index 65378ac9..00000000 --- a/conf/lib.obsoleted/cdist_package.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# -# 2010 Nico Schottelius (nico-cdist at schottelius.org) -# -# This file is part of cdist. -# -# cdist is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# cdist is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with cdist. If not, see . -# -# - -cdist_package() -{ - # select backend - backend="$(cdist_package_select_backend)" - - case "$1" in - install|is_installed|uninstall) - operation="$1"; shift - ${backend}_${operation} "$@" - ;; - - *) - echo "Unsupported operation" - ;; - esac -} diff --git a/conf/lib.obsoleted/cdist_package_backend_pacman_install.sh b/conf/lib.obsoleted/cdist_package_backend_pacman_install.sh deleted file mode 100644 index 6b716b83..00000000 --- a/conf/lib.obsoleted/cdist_package_backend_pacman_install.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# 2010 Nico Schottelius (nico-cdist at schottelius.org) -# -# This file is part of cdist. -# -# cdist is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# cdist is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with cdist. If not, see . -# -# -# Install a package -# -# - -cdist_package_backend_pacman_install() -{ - pacman --noconfirm --noprogressbar -S "$@" -} diff --git a/conf/lib.obsoleted/cdist_package_select_backend.sh b/conf/lib.obsoleted/cdist_package_select_backend.sh deleted file mode 100644 index f4cd4bc4..00000000 --- a/conf/lib.obsoleted/cdist_package_select_backend.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# 2010 Nico Schottelius (nico-cdist at schottelius.org) -# -# This file is part of cdist. -# -# cdist is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# cdist is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with cdist. If not, see . -# -# -# Select correct package management system -# -# - -cdist_package_select_backend() -{ - echo "cdist_package_backend_$(cdist_explore_pkg_system)" -} diff --git a/conf/types/package/hints b/conf/types/package/hints new file mode 100644 index 00000000..76fbcae6 --- /dev/null +++ b/conf/types/package/hints @@ -0,0 +1,2 @@ +install/pacman: +pacman --noconfirm --noprogressbar -S