remove __addifnosuchline and __removeline in 2.1 branch

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2012-09-20 17:46:03 +02:00
parent 065979b8d8
commit b1b86b2ebf
11 changed files with 0 additions and 221 deletions

View file

@ -1,48 +0,0 @@
#!/bin/sh
#
# 2010-2011 Daniel Roth (dani-cdist@d-roth.li)
# 2011 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 <http://www.gnu.org/licenses/>.
#
#
if [ -f "$__object/parameter/file" ]; then
file=$(cat "$__object/parameter/file")
else
file="/$__object_id"
fi
if [ -f "$__object/parameter/regex" ]; then
regex=$(cat "$__object/parameter/regex")
else
wrap=$(cat "$__object/parameter/line")
regex="^$wrap\$"
fi
if [ -f "$file" ]; then
# sh -e is our environment, we know what we do,
# skip error detection for now
set +e
grep -q "$regex" "$file"
if [ $? -eq 1 ]; then
echo "NOTFOUND"
else
echo "FOUND"
fi
else
echo "NOTFOUND"
fi

View file

@ -1,33 +0,0 @@
#!/bin/sh
#
# 2010-2011 Daniel Roth (dani-cdist@d-roth.li)
#
# 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 <http://www.gnu.org/licenses/>.
#
#
if [ -f "$__object/parameter/file" ]; then
file=$(cat "$__object/parameter/file")
else
file="/$__object_id"
fi
result=$(cat "$__object/explorer/findline")
if [ "$result" = "NOTFOUND" ]; then
line=$(cat "$__object/parameter/line")
echo "echo \"$line\" >> $file"
fi

View file

@ -1,52 +0,0 @@
cdist-type__addifnosuchline(7)
==============================
Daniel Roth <dani-cdist--@--d-roth.li>
NAME
----
cdist-type__addifnosuchline - Add a line (if not existing already)
DESCRIPTION
-----------
This type can be used to check a file for existence of a
specific line and adding it, if it was not found.
REQUIRED PARAMETERS
-------------------
line::
Specifies the content which shall be added if not existing.
OPTIONAL PARAMETERS
-------------------
file::
If supplied, use this as the destination file.
Otherwise the object_id is used.
regex::
If supplied, search for this regex.
Otherwise entire line must be matched.
EXAMPLES
--------
--------------------------------------------------------------------------------
# Creates or appends the line specified in "include_www" to the file "lighttpd.conf"
__addifnosuchline www --file /etc/lighttpd.conf --line include_www
# Adds the line "include_git" to the file "lighttpd.conf"
__addifnosuchline /etc/lighttpd.conf --line include_git
--------------------------------------------------------------------------------
SEE ALSO
--------
- cdist-type(7)
COPYING
-------
Copyright \(C) 2011 Daniel Roth. Free use of this software is
granted under the terms of the GNU General Public License version 3 (GPLv3).

View file

@ -1 +0,0 @@
echo "WARNING: Type __addifnosuchline is deprecated and will be removed in cdist 2.1. Please use __line instead" >&2

View file

@ -1,2 +0,0 @@
file
regex

View file

@ -1 +0,0 @@
line

View file

@ -1,31 +0,0 @@
#!/bin/sh
#
# 2010-2011 Daniel Roth (dani-cdist@d-roth.li)
#
# 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 <http://www.gnu.org/licenses/>.
#
#
if [ -f "$__object/parameter/file" ]; then
file=$(cat "$__object/parameter/file")
else
file="/$__object_id"
fi
line=$(cat "$__object/parameter/line")
echo "ex -c \"/${line}/d|w|q\" \"${file}\" <<eof
q
eof"

View file

@ -1,50 +0,0 @@
cdist-type__removeline(7)
=========================
Daniel Roth <dani-cdist--@--d-roth.li>
NAME
----
cdist-type__removeline - Remove a line (if existing)
DESCRIPTION
-----------
This type can be used to check a file for existence of a
specific line and removeing it, if it was found.
REQUIRED PARAMETERS
-------------------
line::
Specifies the content which shall be removed if existing.
OPTIONAL PARAMETERS
-------------------
file::
If supplied, use this as the destination file.
Otherwise the object_id is used.
EXAMPLES
--------
--------------------------------------------------------------------------------
# Removes the line specifiend in "include_www" from the file "lighttpd.conf"
__removeline www --file /etc/lighttpd.conf --line include_www
# Removes the line "include_git" from the file "lighttpd.conf"
__removeline /etc/lighttpd.conf --line include_git
--------------------------------------------------------------------------------
SEE ALSO
--------
- cdist-type(7)
COPYING
-------
Copyright \(C) 2011 Daniel Roth. Free use of this software is
granted under the terms of the GNU General Public License version 3 (GPLv3).

View file

@ -1 +0,0 @@
echo "WARNING: Type __removeline is deprecated and will be removed in cdist 2.1. Please use __line instead" >&2

View file

@ -1 +0,0 @@
file

View file

@ -1 +0,0 @@
line